Merge branch 'main' into docs/misc-feedback-updates

nginxinc · Feb 1, 2024 · 175b394 · 175b394
2 parents a760a76 + 0d4d821
commit 175b394
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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: |

diff --git 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