fix circleci deploy

3scale · Feb 12, 2018 · ec2d2e4 · ec2d2e4
1 parent ecc7e46
commit ec2d2e4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,11 +2,11 @@ version: 2
 jobs:
   deploy:
     docker:
-      - image: quay.io/3scale/s2i:v1.1.5-ce
+      - image: quay.io/3scale/s2i:v1.1.8-ce
         environment:
           APICAST_VERSION: master
     environment:
-      REGISTRY: "${DOCKER_REGISTRY}/3scale"
+      DOCKER_REGISTRY: "quay.io"
     working_directory: /root/apicast-cloud
     steps:
       - checkout
@@ -18,7 +18,7 @@ jobs:
           name: Push docker image
           command: |
             if [ -n "${CIRCLE_TAG}" ] || [ -n "${CIRCLE_BRANCH}" ]; then
-              docker login -u="${DOCKER_USER}" -p="${DOCKER_PASS}" "${DOCKER_REGISTRY}"
+              docker login -u="${DOCKER_USERNAME}" --password-stdin "${DOCKER_REGISTRY}" <<< "${DOCKER_PASSWORD}"
               (cd apicast && make push REMOTE_IMAGE_NAME=apicast-cloud-hosted:apicast-${CIRCLE_TAG:-${CIRCLE_BRANCH}})
               (cd mapping-service && make push IMAGE_TAG=${CIRCLE_TAG:-${CIRCLE_BRANCH}})
             fi
@@ -58,11 +58,11 @@ jobs:
           environment:
             JUNIT_OUTPUT_FILE: tmp/junit/prove.xml
             TEST_NGINX_ERROR_LOG: tmp/prove.log
-      - store_test_results:
-          path: apicast/tmp/junit
       - store_artifacts:
           path: apicast/tmp
           destination: tmp
+      - store_test_results:
+          path: apicast/tmp/junit
 workflows:
   version: 2
   build_and_test: