Skip to content

Commit 7a8cb27

Browse files
otani88otani88
authored
ci: add ghcr to list of registies (#3440)
## What ❔ Add ghcr.io to list of registries for image storing ## Why ❔ Cost optimization ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`.
1 parent e25af90 commit 7a8cb27

File tree

4 files changed

+57
-1
lines changed

4 files changed

+57
-1
lines changed

‎.github/workflows/build-contract-verifier-template.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ jobs:
147147
build-images:
148148
name: Build and Push Docker Images
149149
needs: prepare-contracts
150+
permissions:
151+
packages: write
152+
contents: read
150153
runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
151154
strategy:
152155
matrix:
@@ -208,6 +211,14 @@ jobs:
208211
docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
209212
gcloud auth configure-docker us-docker.pkg.dev -q
210213
214+
- name: Login to GitHub Container Registry
215+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
216+
if: ${{ inputs.action == 'push' }}
217+
with:
218+
registry: ghcr.io
219+
username: ${{ github.actor }}
220+
password: ${{ secrets.GITHUB_TOKEN }}
221+
211222
- name: Build and push
212223
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
213224
with:
@@ -223,13 +234,14 @@ jobs:
223234
tags: |
224235
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
225236
matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
237+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
226238
227239
- name: Push docker image
228240
if: ${{ inputs.action == 'push' }}
229241
run: |
230242
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
231243
docker push matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
232-
244+
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
233245
234246
create_manifest:
235247
name: Create release manifest

‎.github/workflows/build-core-template.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ jobs:
155155
env:
156156
IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.components == 'external-node') && '-alpha' || '' }}
157157
runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
158+
permissions:
159+
packages: write
160+
contents: read
158161
strategy:
159162
matrix:
160163
components:
@@ -217,6 +220,14 @@ jobs:
217220
docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
218221
gcloud auth configure-docker us-docker.pkg.dev -q
219222
223+
- name: Login to GitHub Container Registry
224+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
225+
if: ${{ inputs.action == 'push' }}
226+
with:
227+
registry: ghcr.io
228+
username: ${{ github.actor }}
229+
password: ${{ secrets.GITHUB_TOKEN }}
230+
220231
- name: Build docker image
221232
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
222233
with:
@@ -231,13 +242,15 @@ jobs:
231242
RUSTC_WRAPPER=sccache
232243
tags: |
233244
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
245+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
234246
matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
235247
236248
- name: Push docker image
237249
if: ${{ inputs.action == 'push' }}
238250
run: |
239251
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
240252
docker push matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
253+
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
241254
242255
create_manifest:
243256
name: Create release manifest

‎.github/workflows/build-prover-template.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ jobs:
9191
env:
9292
PROTOCOL_VERSION: ${{ needs.get-protocol-version.outputs.protocol_version }}
9393
runs-on: [matterlabs-ci-runner-high-performance]
94+
permissions:
95+
packages: write
96+
contents: read
9497
strategy:
9598
matrix:
9699
components:
@@ -153,6 +156,14 @@ jobs:
153156
docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
154157
gcloud auth configure-docker us-docker.pkg.dev -q
155158
159+
- name: Login to GitHub Container Registry
160+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
161+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
162+
with:
163+
registry: ghcr.io
164+
username: ${{ github.actor }}
165+
password: ${{ secrets.GITHUB_TOKEN }}
166+
156167
- name: Build and push
157168
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
158169
with:
@@ -170,19 +181,25 @@ jobs:
170181
tags: |
171182
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
172183
matterlabs/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
184+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
173185
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
174186
matterlabs/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
187+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
175188
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:latest
189+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:latest
176190
matterlabs/${{ matrix.components }}:latest
177191
178192
- name: Push docker image
179193
if: ${{ inputs.action == 'push' }}
180194
run: |
181195
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
182196
docker push matterlabs/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
197+
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
183198
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
199+
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
184200
docker push matterlabs/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
185201
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:latest
202+
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:latest
186203
docker push matterlabs/${{ matrix.components }}:latest
187204
188205
copy-images:

‎.github/workflows/build-witness-generator-template.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ jobs:
7878
build-images:
7979
name: Build and Push Docker Images
8080
needs: get-protocol-version
81+
permissions:
82+
packages: write
83+
contents: read
8184
env:
8285
PROTOCOL_VERSION: ${{ needs.get-protocol-version.outputs.protocol_version }}
8386
runs-on: [matterlabs-ci-runner-c3d]
@@ -115,6 +118,14 @@ jobs:
115118
docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
116119
gcloud auth configure-docker us-docker.pkg.dev -q
117120
121+
- name: Login to GitHub Container Registry
122+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
123+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
124+
with:
125+
registry: ghcr.io
126+
username: ${{ github.actor }}
127+
password: ${{ secrets.GITHUB_TOKEN }}
128+
118129
- name: Build and push
119130
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
120131
with:
@@ -132,7 +143,10 @@ jobs:
132143
tags: |
133144
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
134145
matterlabs/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
146+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ env.IMAGE_TAG_SHA_TS }}
135147
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
148+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
136149
matterlabs/${{ matrix.components }}:2.0-${{ env.IMAGE_TAG_SHA_TS }}
137150
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:latest
151+
ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:latest
138152
matterlabs/${{ matrix.components }}:latest

0 commit comments

Comments
 (0)