From d29b8120280259f3a74e13dceb0e1023b0fda9f9 Mon Sep 17 00:00:00 2001 From: Kyle Kyrazis Date: Mon, 10 Aug 2026 13:54:39 -0400 Subject: [PATCH 1/2] Add multi-arch builds for c10s and c9s pg18 images Assisted-by: Claude --- .github/workflows/build-and-push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 5dc7ee5f..43112464 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -87,8 +87,8 @@ jobs: docker_context: 18 steps: - - name: check if Dockerfile is c9s, then Build multi arch image and push to quay.io registry - if: matrix.dockerfile == '13/Dockerfile.c9s' || matrix.dockerfile == '15/Dockerfile.c9s' || matrix.dockerfile == '16/Dockerfile.c9s' + - name: Build multi arch image and push to quay.io registry + if: matrix.dockerfile == '13/Dockerfile.c9s' || matrix.dockerfile == '15/Dockerfile.c9s' || matrix.dockerfile == '16/Dockerfile.c9s' || matrix.dockerfile == '18/Dockerfile.c9s' || contains(matrix.dockerfile, '.c10s') uses: sclorg/build-and-push-action@v4 with: registry: "quay.io" @@ -101,8 +101,8 @@ jobs: image_name: ${{ matrix.image_name }} archs: amd64, s390x, ppc64le, arm64 - - name: Check if Dockerfile is not c9s, then Build and push to quay.io registry - if: matrix.dockerfile != '13/Dockerfile.c9s' && matrix.dockerfile != '15/Dockerfile.c9s' && matrix.dockerfile != '16/Dockerfile.c9s' + - name: Build single arch image and push to quay.io registry + if: matrix.dockerfile != '13/Dockerfile.c9s' && matrix.dockerfile != '15/Dockerfile.c9s' && matrix.dockerfile != '16/Dockerfile.c9s' && matrix.dockerfile != '18/Dockerfile.c9s' && !contains(matrix.dockerfile, '.c10s') uses: sclorg/build-and-push-action@v4 with: registry: "quay.io" From deb1ca5dbb2959948b6d35863a2a81c575ff88bd Mon Sep 17 00:00:00 2001 From: Will Gordon Date: Mon, 9 Nov 2026 11:48:36 -0500 Subject: [PATCH 2/2] ci: builds multi-arch images for all targets All base images across c9s, c10s, and Fedora already publish four-arch manifests, so a single unconditional step avoids per-target conditions. Fixes: https://github.com/sclorg/postgresql-container/issues/668 --- .github/workflows/build-and-push.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 43112464..d7007bd1 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -87,8 +87,7 @@ jobs: docker_context: 18 steps: - - name: Build multi arch image and push to quay.io registry - if: matrix.dockerfile == '13/Dockerfile.c9s' || matrix.dockerfile == '15/Dockerfile.c9s' || matrix.dockerfile == '16/Dockerfile.c9s' || matrix.dockerfile == '18/Dockerfile.c9s' || contains(matrix.dockerfile, '.c10s') + - name: Build and push to quay.io registry uses: sclorg/build-and-push-action@v4 with: registry: "quay.io" @@ -100,18 +99,5 @@ jobs: tag: ${{ matrix.tag }} image_name: ${{ matrix.image_name }} archs: amd64, s390x, ppc64le, arm64 - - - name: Build single arch image and push to quay.io registry - if: matrix.dockerfile != '13/Dockerfile.c9s' && matrix.dockerfile != '15/Dockerfile.c9s' && matrix.dockerfile != '16/Dockerfile.c9s' && matrix.dockerfile != '18/Dockerfile.c9s' && !contains(matrix.dockerfile, '.c10s') - uses: sclorg/build-and-push-action@v4 - with: - registry: "quay.io" - registry_namespace: ${{ matrix.registry_namespace }} - registry_username: ${{ secrets[matrix.quayio_username] }} - registry_token: ${{ secrets[matrix.quayio_token] }} - dockerfile: ${{ matrix.dockerfile }} - docker_context: ${{ matrix.docker_context }} - tag: ${{ matrix.tag }} - image_name: ${{ matrix.image_name }} readme: "${{ matrix.docker_context }}/README.md" quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}