aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2023-07-03 12:08:53 +0200
committerJakob Borg <jakob@kastelo.net>2023-07-03 12:08:53 +0200
commitb7d526903e0944fa418a8232e54e11e84f9652ac (patch)
treea8f66a479f8f2606f448d6d968bcdf5e984e3fa4
parent92917c9f628b780d94e056a65f6d5b3c042f1226 (diff)
downloadsyncthing-b7d526903e0944fa418a8232e54e11e84f9652ac.tar.gz
syncthing-b7d526903e0944fa418a8232e54e11e84f9652ac.zip
build: Push to correct Docker images
-rw-r--r--.github/workflows/build-syncthing.yaml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml
index 75c05004c..caaefe1df 100644
--- a/.github/workflows/build-syncthing.yaml
+++ b/.github/workflows/build-syncthing.yaml
@@ -656,10 +656,13 @@ jobs:
include:
- pkg: syncthing
dockerfile: Dockerfile
+ image: syncthing/syncthing
- pkg: strelaysrv
dockerfile: Dockerfile.strelaysrv
+ image: syncthing/relaysrv
- pkg: stdiscosrv
dockerfile: Dockerfile.stdiscosrv
+ image: syncthing/discosrv
steps:
- uses: actions/checkout@v3
with:
@@ -705,13 +708,13 @@ jobs:
echo Release version, pushing to :latest and version tags
major=${version%.*.*}
minor=${version%.*}
- tags=syncthing/${{ matrix.pkg }}:$version,syncthing/${{ matrix.pkg }}:$major,syncthing/${{ matrix.pkg }}:$minor,syncthing/${{ matrix.pkg }}:latest
+ tags=${{ matrix.image }}:$version,${{ matrix.image }}:$major,${{ matrix.image }}:$minor,${{ matrix.image }}:latest
elif [[ $version == *-rc.@([0-9]|[0-9][0-9]) ]] ; then
echo Release candidate, pushing to :rc
- tags=syncthing/${{ matrix.pkg }}:rc
+ tags=${{ matrix.image }}:rc
else
echo Development version, pushing to :edge
- tags=syncthing/${{ matrix.pkg }}:edge
+ tags=${{ matrix.image }}:edge
fi
echo "DOCKER_TAGS=$tags" >> $GITHUB_ENV