ci fix

gochain · Sep 20, 2018 · 5807518 · 5807518
1 parent a5313e6
commit 5807518
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -126,9 +126,6 @@ jobs:
           docker_layer_caching: true
       - attach_workspace:
           at: .
-      - run:
-          name: Store Service Account
-          command: echo $ACCT_AUTH > ${HOME}/gcloud-service-key.json
       - run:
           name: install dependencies
           command: |
@@ -144,10 +141,11 @@ jobs:
       - deploy:
           command: |
             if [[ "${CIRCLE_BRANCH}" == "master" && -z "${CIRCLE_PR_REPONAME}" ]]; then
-              echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
               git config --global user.email "ci@gochain.io"
               git config --global user.name "CI"
               git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
+              echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+              echo $DOCKER_PASS | docker login -u _json_key --password-stdin https://gcr.io
               ./release.sh
             fi
 
@@ -158,9 +156,6 @@ jobs:
           docker_layer_caching: true
       - attach_workspace:
           at: .
-      - run:
-          name: Store Service Account
-          command: echo $ACCT_AUTH > ${HOME}/gcloud-service-key.json
       - run:
           name: install dependencies
           command: |
@@ -172,9 +167,9 @@ jobs:
             echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
             docker build . -t gochain/gochain:${CIRCLE_BRANCH}
             docker push gochain/gochain:${CIRCLE_BRANCH}
-            echo $ACCT_AUTH > ${HOME}/gcloud-service-key.json
+            echo $GOOGLE_AUTH > ${HOME}/gcloud-service-key.json
+            echo $GOOGLE_AUTH | docker login -u _json_key --password-stdin https://gcr.io
             ./tmp/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json
-            docker login -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
             docker tag gochain/gochain:${CIRCLE_BRANCH} gcr.io/gochain-core/gochain:${CIRCLE_BRANCH}
             docker push gcr.io/gochain-core/gochain:${CIRCLE_BRANCH}
 

diff --git a/release.sh b/release.sh
@@ -36,9 +36,7 @@ docker push $user/$image:$version
 docker push $user/$image:latest
 
 #Push docker images to GCR
-echo $ACCT_AUTH > ${HOME}/gcloud-service-key.json
 ./tmp/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json
-docker login -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
 docker tag $user/$image:latest gcr.io/$gcr_project/$image:latest
 docker tag $user/$image:latest gcr.io/$gcr_project/$image:$version
 docker push gcr.io/$gcr_project/$image:latest