circleci conf: working with push to dockerhub

mozilla-services · May 30, 2017 · 0af4474 · 0af4474
1 parent cd6a696
commit 0af4474
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -61,16 +61,16 @@ jobs:
           working_directory: /socorro
           command: make dockertest
 
-      # - run:
-      #     name: Push to Dockerhub
-      #     working_directory: /socorro
-      #     command: |
-      #       # set DOCKER_DEPLOY=true in Circle UI to push to Dockerhub
-      #       DOCKER_DEPLOY="${DOCKER_DEPLOY:-false}"
-      #       if [ "${CIRCLE_BRANCH}" == "master" ]; then
-      #         bin/ci/deploy-dockerhub.sh latest
-      #         bin/ci/deploy-dockerhub.sh "circle_build_$CIRCLE_BUILD_NUM"
-      #       fi
-      #       if [ -n "${CIRCLE_TAG}"]; then
-      #         bin/ci/deploy-dockerhub.sh "$CIRCLE_TAG"j
-      #       fi
+      - run:
+          name: Push to Dockerhub
+          working_directory: /socorro
+          command: |
+            # set DOCKER_DEPLOY=true in Circle UI to push to Dockerhub
+            DOCKER_DEPLOY="${DOCKER_DEPLOY:-false}"
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              bin/ci/deploy-dockerhub.sh latest
+              bin/ci/deploy-dockerhub.sh "circle_build_$CIRCLE_BUILD_NUM"
+            fi
+            if [ -n "${CIRCLE_TAG}"]; then
+              bin/ci/deploy-dockerhub.sh "$CIRCLE_TAG"j
+            fi
diff --git a/bin/ci/deploy-dockerhub.sh b/bin/ci/deploy-dockerhub.sh
@@ -29,9 +29,9 @@ retry 3 docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWO
 if [ -n "$1" ]; then
     [ "$1" == master ] && TAG=latest || TAG="$1"
     for image in "socorro_processor" "socorro_webapp"; do
-        docker tag "$image:latest" "mozilla/$image:$TAG" ||
-            (echo "Couldn't tag $image:latest as mozilla/$image:$TAG" && false)
-        retry 3 docker push "mozilla/socorro:$TAG" ||
+        docker tag "local/$image:latest" "mozilla/$image:$TAG" ||
+            (echo "Couldn't tag local/$image:latest as mozilla/$image:$TAG" && false)
+        retry 3 docker push "mozilla/$image:$TAG" ||
             (echo "Couldn't push mozilla/$image:$TAG" && false)
         echo "Pushed mozilla/$image:$TAG"
     done

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile.processor
+    image: local/socorro_processor
     env_file:
       - docker/config/docker_common.env
       - docker/config/processor.env