From 95766e90c9d13fad4745174d343834f62f9b7026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Jul 2019 16:56:59 +0200 Subject: [PATCH] Switch to test pt. 2 --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index ca651c4..5481343 100755 --- a/build.sh +++ b/build.sh @@ -33,7 +33,7 @@ else TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT" fi - if [[ -n $EXTRA_TAG ]]; then + if [[ -n ${EXTRA_TAG:-} ]]; then TAGS="$TAGS -t $DOCKER_REPO:$EXTRA_TAG" fi fi @@ -55,21 +55,21 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRA fi # push a tag on a branch other than master - if [[ -n "$TRAVIS_BRANCH" ]] && [[ "$TRAVIS_BRANCH" != "${VERSION%-*}" ]] && [[ "$TRAVIS_BRANCH" != "master" ]]; then + if [[ -n $TRAVIS_BRANCH ]] && [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then docker push "$DOCKER_REPO:$TRAVIS_BRANCH" fi # push an incremental tag - if [[ "$TRAVIS_BRANCH" != "${VERSION%-*}" ]]; then + if [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]]; then docker push "$DOCKER_REPO:$TRAVIS_BRANCH" fi - if [[ -n "$TRAVIS_TAG" ]] || [[ "$CI" == "" ]]; then + if [[ -n $TRAVIS_TAG ]] || [[ $CI == "" ]]; then docker push "$DOCKER_REPO:$VERSION" docker push "$DOCKER_REPO:$VERSION_SHORT" fi - if [[ -n "$EXTRA_TAG" ]]; then + if [[ -n ${EXTRA_TAG:-} ]]; then docker push "$DOCKER_REPO:$EXTRA_TAG" fi