🐞 Fix parameter passing

This commit is contained in:
Christian Mäder 2018-03-05 16:29:02 +01:00
parent bc786364d9
commit 747b32adb2
No known key found for this signature in database
GPG Key ID: 92FFD0A711F196BB

View File

@ -76,14 +76,6 @@ case "${BRANCH}" in
esac
DOCKER_TAG="${DOCKER_TAG-${DOCKER_ORG}/${DOCKER_REPO}:${TAG}}"
# caching is only ok for version tags
case "${TAG}" in
v*)
CACHE="${CACHE-}";;
*)
CACHE="${CACHE---no-cache}";;
esac
# Checking which VARIANT to build
if [ -z "$VARIANT" ]; then
DOCKERFILE="Dockerfile"
@ -103,11 +95,15 @@ else
fi
fi
# Docker options
DOCKER_OPTS=(
"$CACHE"
--pull
)
DOCKER_OPTS=("${DOCKER_OPTS[@]}")
# caching is only ok for version tags
case "${TAG}" in
v*) ;;
*) DOCKER_OPTS+=( "--no-cache" ) ;;
esac
DOCKER_OPTS+=( "--pull" )
# Build args
DOCKER_BUILD_ARGS=(