Skip to content

Commit 67b1309

Browse files
ThomasSamsonThomasSamson
committed
Switch to artifact registry
1 parent 87f2ab4 commit 67b1309

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
id: docker-metadata
6565
uses: docker/metadata-action@v4
6666
with:
67-
images: eu.gcr.io/${{ secrets.gke-project }}/website/php
67+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php
6868
tags: |
6969
type=raw,value=${{ github.sha }},priority=9999
7070
${{ inputs.tags }}
@@ -78,10 +78,10 @@ jobs:
7878
tags: ${{ steps.docker-metadata.outputs.tags }}
7979
labels: ${{ steps.docker-metadata.outputs.labels }}
8080
cache-from: |
81-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:latest
82-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:latest
83-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
84-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:${{ github.sha }}
81+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
82+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
83+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
84+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
8585
cache-to: type=inline
8686
outputs:
8787
version: ${{ github.sha }}
@@ -115,7 +115,7 @@ jobs:
115115
id: docker-metadata
116116
uses: docker/metadata-action@v4
117117
with:
118-
images: eu.gcr.io/${{ secrets.gke-project }}/website/caddy
118+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy
119119
tags: |
120120
type=raw,value=${{ github.sha }},priority=9999
121121
${{ inputs.tags }}
@@ -129,10 +129,10 @@ jobs:
129129
tags: ${{ steps.docker-metadata.outputs.tags }}
130130
labels: ${{ steps.docker-metadata.outputs.labels }}
131131
cache-from: |
132-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:latest
133-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:latest
134-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
135-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/php:${{ github.sha }}
132+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
133+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
134+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
135+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
136136
cache-to: type=inline
137137
outputs:
138138
version: ${{ github.sha }}
@@ -166,7 +166,7 @@ jobs:
166166
id: docker-metadata
167167
uses: docker/metadata-action@v4
168168
with:
169-
images: eu.gcr.io/${{ secrets.gke-project }}/website/pwa
169+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa
170170
tags: |
171171
type=raw,value=${{ github.sha }},priority=9999
172172
${{ inputs.tags }}
@@ -196,8 +196,8 @@ jobs:
196196
build-args: |
197197
NEXT_ROOT_URL=${{ env.URL }}
198198
cache-from: |
199-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/pwa:latest
200-
type=registry,ref=eu.gcr.io/${{ secrets.gke-project }}/website/pwa:${{ github.sha }}
199+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:latest
200+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:${{ github.sha }}
201201
cache-to: type=inline
202202
secrets: |
203203
"GITHUB_KEY=${{ secrets.gh-key }}"

‎.github/workflows/deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ jobs:
111111
--atomic \
112112
--namespace=${{ env.NAMESPACE }} \
113113
--set=app.version=${{ github.sha }} \
114-
--set=php.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/php \
114+
--set=php.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php \
115115
--set=php.image.tag=${{ inputs.docker-images-version }} \
116116
--set=php.image.pullPolicy=Always \
117-
--set=caddy.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/caddy \
117+
--set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \
118118
--set=caddy.image.tag=${{ inputs.docker-images-version }} \
119119
--set=caddy.image.pullPolicy=Always \
120-
--set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
120+
--set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \
121121
--set=pwa.image.tag=${{ inputs.docker-images-version }} \
122122
--set=pwa.image.pullPolicy=Always \
123123
--set=bucket.s3Upstream=storage.googleapis.com \
@@ -150,13 +150,13 @@ jobs:
150150
--atomic \
151151
--namespace=${{ env.NAMESPACE }} \
152152
--set=app.version=${{ github.sha }} \
153-
--set=php.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/php \
153+
--set=php.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php \
154154
--set=php.image.tag=${{ inputs.docker-images-version }} \
155155
--set=php.image.pullPolicy=Always \
156-
--set=caddy.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/caddy \
156+
--set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \
157157
--set=caddy.image.tag=${{ inputs.docker-images-version }} \
158158
--set=caddy.image.pullPolicy=Always \
159-
--set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
159+
--set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \
160160
--set=pwa.image.tag=${{ inputs.docker-images-version }} \
161161
--set=pwa.image.pullPolicy=Always \
162162
--set=php.corsAllowOrigin="^$(echo "${{ join(fromJSON(env.CORS), '|') }}" | sed 's/\./\\./g')$" \

0 commit comments

Comments
 (0)