diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 5dc7ee5f..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: 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 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: 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' - 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 }}