Fixed tagged CI docker builds

screepers · May 10, 2019 · 3689c48 · 3689c48
1 parent 927ebde
commit 3689c48
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -58,8 +58,10 @@ jobs:
         command: |
           set -x
           DOCKER_IMAGE=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-          docker tag $CIRCLE_PROJECT_REPONAME $DOCKER_IMAGE:$CIRCLE_BRANCH
           docker tag $CIRCLE_PROJECT_REPONAME $DOCKER_IMAGE:${CIRCLE_SHA1:0:7}
+          if [[ -n "$CIRCLE_BRANCH" ]]; then
+            docker tag $CIRCLE_PROJECT_REPONAME $DOCKER_IMAGE:$CIRCLE_BRANCH
+          fi
           if [[ -n "$CIRCLE_TAG" ]]; then
             docker tag $CIRCLE_PROJECT_REPONAME $DOCKER_IMAGE:$CIRCLE_TAG || true
             docker tag $CIRCLE_PROJECT_REPONAME $DOCKER_IMAGE:latest || true