From e996860d69655d8aab0c8ed72b6ec85958cfa022 Mon Sep 17 00:00:00 2001 From: oseoin Date: Wed, 31 Jan 2024 16:52:52 +0000 Subject: [PATCH 1/2] Add missing platforms in base image build (#5017) add missing platforms in base image build --- .github/workflows/build-base-images.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml index 8ce03775e8..3abc516262 100644 --- a/.github/workflows/build-base-images.yml +++ b/.github/workflows/build-base-images.yml @@ -97,6 +97,7 @@ jobs: cache-to: type=gha,mode=max target: common tags: ${{ steps.meta.outputs.tags }} + platforms: ${{ matrix.platforms }} pull: true push: true build-args: | @@ -162,6 +163,7 @@ jobs: cache-to: type=gha,mode=max target: common tags: ${{ steps.meta.outputs.tags }} + platforms: ${{ matrix.platforms }} pull: true push: true build-args: | @@ -248,6 +250,7 @@ jobs: cache-to: type=gha,mode=max target: common tags: ${{ steps.meta.outputs.tags }} + platforms: ${{ matrix.platforms }} pull: true push: true build-args: | From 0d4d821137b7ec914b989d9b5e12823d1c8a0e72 Mon Sep 17 00:00:00 2001 From: Paul Abel <128620221+pdabelf5@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:08:15 +0000 Subject: [PATCH 2/2] trim image sha256 from release update workflow (#5018) Co-authored-by: oseoin --- .github/workflows/update-docker-images.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 4bbdac6f13..a2515ff45e 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -50,9 +50,9 @@ jobs: - name: Set NGINX versions id: versions run: | - nginx=library/$(grep -E "FROM nginx.*debian" < build/Dockerfile | awk -F" " '{print $2}') - nginx_alpine=library/$(grep -E "FROM nginx.*alpine" < build/Dockerfile | awk -F" " '{print $2}') - nginx_ubi=$(grep -m1 "FROM nginx.*ubi" < build/Dockerfile | awk -F" " '{print $2}') + nginx=library/$(grep -E "FROM nginx.*debian" < build/Dockerfile | awk -F" " '{print $2}' | cut -d '@' -f 1) + nginx_alpine=library/$(grep -E "FROM nginx.*alpine" < build/Dockerfile | awk -F" " '{print $2}' | cut -d '@' -f 1) + nginx_ubi=$(grep -m1 "FROM nginx.*ubi" < build/Dockerfile | awk -F" " '{print $2}' | cut -d '@' -f 1) echo "matrix=[{\"version\": \"${nginx}\", \"distro\": \"debian\"}, {\"version\": \"${nginx_alpine}\", \"distro\": \"alpine\"}, {\"version\": \"${nginx_ubi}\", \"distro\": \"ubi\"}]" >> $GITHUB_OUTPUT - name: Set Go MD5sums