Merge pull request #182 from broadinstitute/jr-build-efficiency

hash tag all images: skip tests
broadinstitute · Jul 12, 2018 · aa11412 · aa11412
2 parents cf4167f + 96a4dc6
commit aa11412
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/docker/build.sh b/docker/build.sh
@@ -42,24 +42,27 @@ function docker_cmd()
 {
     if [ $DOCKER_CMD = "build" ] || [ $DOCKER_CMD = "push" ]; then
         echo "building sam docker image..."
-        if [ "$ENV" != "dev" ] && [ "$ENV" != "alpha" ] && [ "$ENV" != "staging" ] && [ "$ENV" != "perf" ]; then
-            DOCKER_TAG=${BRANCH}
-            DOCKER_TAG_TESTS=${BRANCH}
-        else
-            GIT_SHA=$(git rev-parse origin/${BRANCH})
-            echo GIT_SHA=$GIT_SHA > env.properties
-            DOCKER_TAG=${GIT_SHA:0:12}
-            DOCKER_TAG_TESTS=${GIT_SHA:0:12}
-        fi
-        docker build -t $REPO:${DOCKER_TAG} .
+
+        GIT_SHA=$(git rev-parse origin/${BRANCH})
+        echo GIT_SHA=$GIT_SHA > env.properties
+        DOCKER_TAG=${GIT_SHA:0:12}
+        DOCKER_TAG_TESTS=${GIT_SHA:0:12}
+
+	docker build -t $REPO:${DOCKER_TAG} .
         cd automation
         docker build -f Dockerfile-tests -t $TESTS_REPO:${DOCKER_TAG_TESTS} .
         cd ..
 
         if [ $DOCKER_CMD = "push" ]; then
-            echo "pushing docker image..."
+            echo "pushing $REPO image..."
             docker push $REPO:${DOCKER_TAG}
+            docker tag $REPO:${DOCKER_TAG} $REPO:${BRANCH}
+            docker push $REPO:${BRANCH}
+
+            echo "pushing $TESTS_REPO image..."
             docker push $TESTS_REPO:${DOCKER_TAG_TESTS}
+            docker tag $TESTS_REPO:${DOCKER_TAG_TESTS} $TESTS_REPO:${BRANCH}
+            docker push $TESTS_REPO:${BRANCH}
         fi
     else
         echo "Not a valid docker option!  Choose either build or push (which includes build)"