always write : explicitly, so it is more obvious what it is about - reverts earlier change
This commit is contained in:
parent
262d373a29
commit
b5915a063a
1 changed files with 7 additions and 7 deletions
14
buildx.sh
14
buildx.sh
|
@ -69,8 +69,8 @@ main() {
|
||||||
BUILD_ARGS=""
|
BUILD_ARGS=""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
IMAGE="privatebin/${IMAGE}:"
|
IMAGE="privatebin/${IMAGE}"
|
||||||
IMAGE_TAGS="--tag ${IMAGE}latest --tag ${IMAGE}${TAG} --tag ${IMAGE}${TAG%%-*}"
|
IMAGE_TAGS="--tag ${IMAGE}:latest --tag ${IMAGE}:${TAG} --tag ${IMAGE}:${TAG%%-*}"
|
||||||
|
|
||||||
if [ "${EDGE}" = true ] ; then
|
if [ "${EDGE}" = true ] ; then
|
||||||
# build from alpine:edge instead of the stable release
|
# build from alpine:edge instead of the stable release
|
||||||
|
@ -78,15 +78,15 @@ main() {
|
||||||
BUILD_ARGS+=" -f Dockerfile.edge"
|
BUILD_ARGS+=" -f Dockerfile.edge"
|
||||||
|
|
||||||
# replace the default tags, build just the edge one
|
# replace the default tags, build just the edge one
|
||||||
IMAGE_TAGS="--tag ${IMAGE}edge"
|
IMAGE_TAGS="--tag ${IMAGE}:edge"
|
||||||
IMAGE+="edge"
|
IMAGE+=":edge"
|
||||||
else
|
else
|
||||||
if [ "${EVENT}" = push ] ; then
|
if [ "${EVENT}" = push ] ; then
|
||||||
# append the stable tag on explicit pushes to master or (git) tags
|
# append the stable tag on explicit pushes to master or (git) tags
|
||||||
IMAGE_TAGS+=" --tag ${IMAGE}stable"
|
IMAGE_TAGS+=" --tag ${IMAGE}:stable"
|
||||||
fi
|
fi
|
||||||
# always build latest on normal builds
|
# always build latest on non-edge builds
|
||||||
IMAGE+="latest"
|
IMAGE+=":latest"
|
||||||
fi
|
fi
|
||||||
build_image "${BUILD_ARGS} ${IMAGE_TAGS}"
|
build_image "${BUILD_ARGS} ${IMAGE_TAGS}"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue