build: Push to correct Docker images
This commit is contained in:
@@ -656,10 +656,13 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- pkg: syncthing
|
- pkg: syncthing
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
image: syncthing/syncthing
|
||||||
- pkg: strelaysrv
|
- pkg: strelaysrv
|
||||||
dockerfile: Dockerfile.strelaysrv
|
dockerfile: Dockerfile.strelaysrv
|
||||||
|
image: syncthing/relaysrv
|
||||||
- pkg: stdiscosrv
|
- pkg: stdiscosrv
|
||||||
dockerfile: Dockerfile.stdiscosrv
|
dockerfile: Dockerfile.stdiscosrv
|
||||||
|
image: syncthing/discosrv
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
@@ -705,13 +708,13 @@ jobs:
|
|||||||
echo Release version, pushing to :latest and version tags
|
echo Release version, pushing to :latest and version tags
|
||||||
major=${version%.*.*}
|
major=${version%.*.*}
|
||||||
minor=${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
|
elif [[ $version == *-rc.@([0-9]|[0-9][0-9]) ]] ; then
|
||||||
echo Release candidate, pushing to :rc
|
echo Release candidate, pushing to :rc
|
||||||
tags=syncthing/${{ matrix.pkg }}:rc
|
tags=${{ matrix.image }}:rc
|
||||||
else
|
else
|
||||||
echo Development version, pushing to :edge
|
echo Development version, pushing to :edge
|
||||||
tags=syncthing/${{ matrix.pkg }}:edge
|
tags=${{ matrix.image }}:edge
|
||||||
fi
|
fi
|
||||||
echo "DOCKER_TAGS=$tags" >> $GITHUB_ENV
|
echo "DOCKER_TAGS=$tags" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user