From 0682b3f4b98555caeb3c217d77e3669622ea65b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Fj=C3=B8rtoft?= Date: Fri, 13 Sep 2024 10:27:57 +0200 Subject: [PATCH 1/5] Update cluster-docker-build-tag-push.yaml --- .github/workflows/cluster-docker-build-tag-push.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cluster-docker-build-tag-push.yaml b/.github/workflows/cluster-docker-build-tag-push.yaml index bf5f3cb..74bb038 100644 --- a/.github/workflows/cluster-docker-build-tag-push.yaml +++ b/.github/workflows/cluster-docker-build-tag-push.yaml @@ -117,11 +117,15 @@ jobs: uses: docker/setup-buildx-action@v3 with: install: true + - name: Add GAR + id: add-gar + run: | + echo images=$(echo ${{ inputs.image }} | sed -E 's#(gcr.io)/(.*)#\1/\2 europe-west1-docker.pkg.dev/amp-artifacts/amp/\2#g') >> "$GITHUB_OUTPUT" - name: Docker meta id: meta uses: docker/metadata-action@v5 with: - images: ${{ inputs.image }} + images: ${{ steps.add-gar.outputs.images }} tags: | type=semver,pattern={{raw}},priority=900 type=sha,prefix=,enable=true,format=short,priority=800 From 9f820a03a83c82e253b5c5fc4cf4b22c71e11317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Fj=C3=B8rtoft?= Date: Fri, 13 Sep 2024 10:32:54 +0200 Subject: [PATCH 2/5] Update cluster-docker-build-tag-push.yaml --- .github/workflows/cluster-docker-build-tag-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cluster-docker-build-tag-push.yaml b/.github/workflows/cluster-docker-build-tag-push.yaml index 74bb038..575de19 100644 --- a/.github/workflows/cluster-docker-build-tag-push.yaml +++ b/.github/workflows/cluster-docker-build-tag-push.yaml @@ -120,7 +120,7 @@ jobs: - name: Add GAR id: add-gar run: | - echo images=$(echo ${{ inputs.image }} | sed -E 's#(gcr.io)/(.*)#\1/\2 europe-west1-docker.pkg.dev/amp-artifacts/amp/\2#g') >> "$GITHUB_OUTPUT" + echo images=$(echo ${{ inputs.image }} | sed -E 's#(gcr.io/atb-mobility-platform)/(.*)#\1/\2\neurope-west1-docker.pkg.dev/amp-artifacts/amp/\2#g') >> "$GITHUB_OUTPUT" - name: Docker meta id: meta uses: docker/metadata-action@v5 From 66156c5bab4f73f343cd4aa741f193b57d9d9051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Fj=C3=B8rtoft?= Date: Fri, 13 Sep 2024 10:41:30 +0200 Subject: [PATCH 3/5] Update cluster-docker-build-tag-push.yaml --- .github/workflows/cluster-docker-build-tag-push.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cluster-docker-build-tag-push.yaml b/.github/workflows/cluster-docker-build-tag-push.yaml index 575de19..6568244 100644 --- a/.github/workflows/cluster-docker-build-tag-push.yaml +++ b/.github/workflows/cluster-docker-build-tag-push.yaml @@ -120,7 +120,11 @@ jobs: - name: Add GAR id: add-gar run: | - echo images=$(echo ${{ inputs.image }} | sed -E 's#(gcr.io/atb-mobility-platform)/(.*)#\1/\2\neurope-west1-docker.pkg.dev/amp-artifacts/amp/\2#g') >> "$GITHUB_OUTPUT" + { + echo 'images<> "$GITHUB_OUTPUT" - name: Docker meta id: meta uses: docker/metadata-action@v5 From 56eca4e8a749f92b77c0d2294bc8f69f91358efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Fj=C3=B8rtoft?= Date: Fri, 13 Sep 2024 10:50:12 +0200 Subject: [PATCH 4/5] Update cluster-docker-build-tag-push.yaml --- .github/workflows/cluster-docker-build-tag-push.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cluster-docker-build-tag-push.yaml b/.github/workflows/cluster-docker-build-tag-push.yaml index 6568244..a00a8fc 100644 --- a/.github/workflows/cluster-docker-build-tag-push.yaml +++ b/.github/workflows/cluster-docker-build-tag-push.yaml @@ -151,6 +151,13 @@ jobs: registry: gcr.io username: oauth2accesstoken password: ${{ steps.auth.outputs.access_token }} + - id: gar-auth + name: Configure docker for GCR + uses: docker/login-action@v3 + with: + registry: europe-west1-docker.pkg.dev + username: oauth2accesstoken + password: ${{ steps.auth.outputs.access_token }} - id: buildpush name: Build and push image uses: docker/build-push-action@v5 From e791d92af97627fa91b8f10369abf3dca1eda8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Fj=C3=B8rtoft?= Date: Fri, 13 Sep 2024 11:03:21 +0200 Subject: [PATCH 5/5] Update cluster-docker-build-tag-push.yaml --- .github/workflows/cluster-docker-build-tag-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cluster-docker-build-tag-push.yaml b/.github/workflows/cluster-docker-build-tag-push.yaml index a00a8fc..8bada04 100644 --- a/.github/workflows/cluster-docker-build-tag-push.yaml +++ b/.github/workflows/cluster-docker-build-tag-push.yaml @@ -122,7 +122,7 @@ jobs: run: | { echo 'images<> "$GITHUB_OUTPUT" - name: Docker meta