Skip to content

Commit c5b7d25

Browse files
committed
chore(docker): prepare v1 image namespace cutover
Intent: point the relaunch line at its future Docker Hub home without publishing from this review branch. Goals: make main the only publishing branch for v1 and align local build, smoke, and compose flows with html2rss/web. Changes: switch CI publish gating to main, replace image references with html2rss/web, and update the helper build script and smoke task image names.
1 parent 65e1644 commit c5b7d25

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ jobs:
146146
run: bundle exec rake
147147

148148
docker-publish:
149-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
149+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
150150
needs:
151151
- docker-test
152152
runs-on: ubuntu-latest
153153
permissions:
154154
contents: read
155155
packages: write
156156
env:
157-
IMAGE_NAME: gilcreator/html2rss-web
157+
IMAGE_NAME: html2rss/web
158158
TAG_SHA: ${{ github.sha }}
159159
steps:
160160
- name: Checkout code
@@ -212,8 +212,8 @@ jobs:
212212
context: .
213213
push: true
214214
tags: |
215-
gilcreator/html2rss-web:latest
216-
gilcreator/html2rss-web:${{ github.sha }}
215+
html2rss/web:latest
216+
html2rss/web:${{ github.sha }}
217217
${{ steps.meta.outputs.tags }}
218218
platforms: linux/amd64,linux/arm64
219219
cache-from: type=local,src=/tmp/.buildx-cache

Rakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ desc 'Build and run docker image/container, and send requests to it'
4646
task :test do
4747
current_dir = ENV.fetch('GITHUB_WORKSPACE', __dir__)
4848
smoke_auto_source_enabled = ENV.fetch('SMOKE_AUTO_SOURCE_ENABLED', 'false')
49+
image_name = 'html2rss/web'
4950

5051
Output.describe 'Building and running'
51-
sh 'docker build -t gilcreator/html2rss-web -f Dockerfile .'
52+
sh "docker build -t #{image_name} -f Dockerfile ."
5253
sh ['docker run',
5354
'-d',
5455
'-p 4000:4000',
@@ -57,7 +58,7 @@ task :test do
5758
"--env AUTO_SOURCE_ENABLED=#{smoke_auto_source_enabled}",
5859
"--mount type=bind,source=#{current_dir}/config,target=/app/config",
5960
'--name html2rss-web-test',
60-
'gilcreator/html2rss-web'].join(' ')
61+
image_name].join(' ')
6162

6263
Output.wait 10, message: 'Waiting for container to start:'
6364

bin/docker-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
set -eux
33

4-
docker build --no-cache -t gilcreator/html2rss-web -f Dockerfile .
4+
docker build --no-cache -t html2rss/web -f Dockerfile .

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
services:
55
html2rss-web:
6-
image: gilcreator/html2rss-web
6+
image: html2rss/web
77
restart: unless-stopped
88
ports:
99
- "127.0.0.1:4000:4000"

0 commit comments

Comments
 (0)