Skip to content

Commit f170987

Browse files
ThomasSamsonThomasSamson
authored
Switch to artifact registry (#595)
1 parent d0a0546 commit f170987

File tree

3 files changed

+62
-44
lines changed

3 files changed

+62
-44
lines changed

‎.github/workflows/build.yml

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,20 @@ jobs:
4848
- uses: actions/setup-python@v4
4949
with:
5050
python-version: 3.9.15
51+
- name: Set up Docker Buildx
52+
uses: docker/setup-buildx-action@v3
5153
- name: Auth gcloud
52-
uses: google-github-actions/auth@v1
54+
id: auth
55+
uses: google-github-actions/auth@v2
5356
with:
57+
token_format: access_token
5458
credentials_json: ${{ secrets.gke-credentials }}
55-
- name: Setup gcloud
56-
uses: google-github-actions/setup-gcloud@v1
59+
- name: Login to GAR
60+
uses: docker/login-action@v3
5761
with:
58-
project_id: ${{ secrets.gke-project }}
62+
registry: europe-west1-docker.pkg.dev
63+
username: oauth2accesstoken
64+
password: ${{ steps.auth.outputs.access_token }}
5965
- name: Configure gcloud
6066
run: |
6167
gcloud --quiet auth configure-docker
@@ -64,7 +70,7 @@ jobs:
6470
id: docker-metadata
6571
uses: docker/metadata-action@v4
6672
with:
67-
images: eu.gcr.io/${{ secrets.gke-project }}/website/php
73+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php
6874
tags: |
6975
type=raw,value=${{ github.sha }},priority=9999
7076
${{ inputs.tags }}
@@ -78,10 +84,10 @@ jobs:
7884
tags: ${{ steps.docker-metadata.outputs.tags }}
7985
labels: ${{ steps.docker-metadata.outputs.labels }}
8086
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 }}
87+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
88+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
89+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
90+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
8591
cache-to: type=inline
8692
outputs:
8793
version: ${{ github.sha }}
@@ -99,14 +105,20 @@ jobs:
99105
- uses: actions/setup-python@v4
100106
with:
101107
python-version: 3.9.15
108+
- name: Set up Docker Buildx
109+
uses: docker/setup-buildx-action@v3
102110
- name: Auth gcloud
103-
uses: google-github-actions/auth@v1
111+
id: auth
112+
uses: google-github-actions/auth@v2
104113
with:
114+
token_format: access_token
105115
credentials_json: ${{ secrets.gke-credentials }}
106-
- name: Setup gcloud
107-
uses: google-github-actions/setup-gcloud@v1
116+
- name: Login to GAR
117+
uses: docker/login-action@v3
108118
with:
109-
project_id: ${{ secrets.gke-project }}
119+
registry: europe-west1-docker.pkg.dev
120+
username: oauth2accesstoken
121+
password: ${{ steps.auth.outputs.access_token }}
110122
- name: Configure gcloud
111123
run: |
112124
gcloud --quiet auth configure-docker
@@ -115,7 +127,7 @@ jobs:
115127
id: docker-metadata
116128
uses: docker/metadata-action@v4
117129
with:
118-
images: eu.gcr.io/${{ secrets.gke-project }}/website/caddy
130+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy
119131
tags: |
120132
type=raw,value=${{ github.sha }},priority=9999
121133
${{ inputs.tags }}
@@ -129,10 +141,10 @@ jobs:
129141
tags: ${{ steps.docker-metadata.outputs.tags }}
130142
labels: ${{ steps.docker-metadata.outputs.labels }}
131143
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 }}
144+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:latest
145+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:latest
146+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy:${{ github.sha }}
147+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php:${{ github.sha }}
136148
cache-to: type=inline
137149
outputs:
138150
version: ${{ github.sha }}
@@ -150,14 +162,20 @@ jobs:
150162
- uses: actions/setup-python@v4
151163
with:
152164
python-version: 3.9.15
165+
- name: Set up Docker Buildx
166+
uses: docker/setup-buildx-action@v3
153167
- name: Auth gcloud
154-
uses: google-github-actions/auth@v1
168+
id: auth
169+
uses: google-github-actions/auth@v2
155170
with:
171+
token_format: access_token
156172
credentials_json: ${{ secrets.gke-credentials }}
157-
- name: Setup gcloud
158-
uses: google-github-actions/setup-gcloud@v1
173+
- name: Login to GAR
174+
uses: docker/login-action@v3
159175
with:
160-
project_id: ${{ secrets.gke-project }}
176+
registry: europe-west1-docker.pkg.dev
177+
username: oauth2accesstoken
178+
password: ${{ steps.auth.outputs.access_token }}
161179
- name: Configure gcloud
162180
run: |
163181
gcloud --quiet auth configure-docker
@@ -166,7 +184,7 @@ jobs:
166184
id: docker-metadata
167185
uses: docker/metadata-action@v4
168186
with:
169-
images: eu.gcr.io/${{ secrets.gke-project }}/website/pwa
187+
images: europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa
170188
tags: |
171189
type=raw,value=${{ github.sha }},priority=9999
172190
${{ inputs.tags }}
@@ -196,8 +214,8 @@ jobs:
196214
build-args: |
197215
NEXT_ROOT_URL=${{ env.URL }}
198216
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 }}
217+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:latest
218+
type=registry,ref=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa:${{ github.sha }}
201219
cache-to: type=inline
202220
secrets: |
203221
"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')$" \

‎pwa/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ RUN pnpm install --offline --frozen-lock
4949

5050
# Development image
5151
FROM deps as dev
52-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
53-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./public/php-web.wasm
54-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./app/playground/utils/
55-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data.js /build/php-web.data.js
56-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.mjs /build/php-web.mjs
52+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data ./public/php-web.data
53+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./public/php-web.wasm
54+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./app/playground/utils/
55+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data.js /build/php-web.data.js
56+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.mjs /build/php-web.mjs
5757
RUN sed '/--pre-js/r /build/php-web.data.js' /build/php-web.mjs > ./app/playground/utils/php-web.mjs
5858

5959
EXPOSE 3000
@@ -66,11 +66,11 @@ FROM builder_base AS builder
6666

6767
COPY --link . .
6868
COPY --from=deps --link /srv/app/node_modules ./node_modules
69-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data ./public/php-web.data
70-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./public/php-web.wasm
71-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.wasm ./app/playground/utils/
72-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.data.js /build/php-web.data.js
73-
COPY --from=phpwasm --link --chown=nextjs:nodejs /build/php-web.mjs /build/php-web.mjs
69+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data ./public/php-web.data
70+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./public/php-web.wasm
71+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.wasm ./app/playground/utils/
72+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.data.js /build/php-web.data.js
73+
COPY --from=phpwasm --link --chown=1001:1001 /build/php-web.mjs /build/php-web.mjs
7474
RUN sed '/--pre-js/r /build/php-web.data.js' /build/php-web.mjs > ./app/playground/utils/php-web.mjs
7575

7676
ARG NEXT_ROOT_URL
@@ -115,9 +115,9 @@ COPY --from=builder --link /srv/app/public ./public
115115

116116
# Automatically leverage output traces to reduce image size
117117
# https://nextjs.org/docs/advanced-features/output-file-tracing
118-
COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/standalone ./
119-
COPY --from=builder --link --chown=nextjs:nodejs /srv/app/public/* ./public/
120-
COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/static ./.next/static
118+
COPY --from=builder --link --chown=1001:1001 /srv/app/.next/standalone ./
119+
COPY --from=builder --link --chown=1001:1001 /srv/app/public/* ./public/
120+
COPY --from=builder --link --chown=1001:1001 /srv/app/.next/static ./.next/static
121121

122122
USER nextjs
123123

0 commit comments

Comments
 (0)