fix ci

.circleci/config.yml

@@ -45,10 +45,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 $ACCT_AUTH | docker login -u _json_key --password-stdin https://gcr.io
               echo $ACCT_AUTH > ${HOME}/gcloud-service-key.json
               make release
             fi

release.sh

@@ -36,7 +36,6 @@ docker push $user/$image:latest
 
 # Push GCR docker images
 ./tmp/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json
-echo $ACCT_AUTH | docker login -u _json_key --password-stdin 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