@@ -83,19 +83,23 @@ jobs:
8383 (needs.check-frontend.result == 'success' || needs.check-frontend.result == 'skipped')
8484
8585 runs-on : ubuntu-latest
86- container : google/cloud-sdk
8786 env :
88- GCLOUD_SERVICE_ACCOUNT_JSON : ${{ secrets.GCLOUD_SERVICE_ACCOUNT_JSON }}
8987 SNAPSHOT_REGISTRY : ${{ secrets.SNAPSHOT_REGISTRY }}
9088 COMMIT_TAG : ${{ github.sha }}
9189
9290 steps :
9391 - run : echo "COMMIT_TAG=$(echo $COMMIT_TAG | cut -c 1-7)" >> $GITHUB_ENV
9492
95- - run : echo $GCLOUD_SERVICE_ACCOUNT_JSON | base64 -d | docker login -u _json_key --password-stdin https://us-docker.pkg.dev
96-
9793 - uses : actions/checkout@v3
9894
95+ - uses : google-github-actions/auth@v2
96+ with :
97+ credentials_json : ${{ secrets.GCLOUD_SERVICE_ACCOUNT_JSON }}
98+
99+ - uses : google-github-actions/setup-gcloud@v2
100+
101+ - run : gcloud auth configure-docker us-docker.pkg.dev
102+
99103 - run : make build
100104 - run : make push
101105
@@ -108,9 +112,7 @@ jobs:
108112 - build-container
109113
110114 runs-on : ubuntu-latest
111- container : google/cloud-sdk
112115 env :
113- GCLOUD_SERVICE_ACCOUNT_JSON : ${{ secrets.GCLOUD_SERVICE_ACCOUNT_JSON }}
114116 SNAPSHOT_REGISTRY : ${{ secrets.SNAPSHOT_REGISTRY }}
115117 RELEASE_REGISTRY : ${{ secrets.RELEASE_REGISTRY }}
116118 COMMIT_TAG : ${{ github.sha }}
@@ -119,11 +121,16 @@ jobs:
119121 steps :
120122 - run : echo "COMMIT_TAG=$(echo $COMMIT_TAG | cut -c 1-7)" >> $GITHUB_ENV
121123
122- - run : echo $GCLOUD_SERVICE_ACCOUNT_JSON | base64 -d > /tmp/service-account.json
123- - run : gcloud auth activate-service-account --key-file=/tmp/service-account.json
124-
125124 - uses : actions/checkout@v3
126125
126+ - uses : google-github-actions/auth@v2
127+ with :
128+ credentials_json : ${{ secrets.GCLOUD_SERVICE_ACCOUNT_JSON }}
129+
130+ - uses : google-github-actions/setup-gcloud@v2
131+
132+ - run : gcloud auth configure-docker us-docker.pkg.dev
133+
127134 - run : make release
128135
129136 # terraform checks
0 commit comments