From 7ff5eee69bd29e1738517852d3f74d1629aa447a Mon Sep 17 00:00:00 2001 From: lejianwen <84855512@qq.com> Date: Sun, 12 Jan 2025 13:53:11 +0800 Subject: [PATCH] fix: remove build i386 s6 image because api not support i386 --- .github/workflows/build.yaml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 754ff40..4a8da79 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -216,7 +216,7 @@ jobs: - { name: "amd64", docker_platform: "linux/amd64", s6_platform: "x86_64" } - { name: "arm64v8", docker_platform: "linux/arm64", s6_platform: "aarch64" } - { name: "armv7", docker_platform: "linux/arm/v7", s6_platform: "armhf" } - - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" } +# - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" } steps: @@ -305,7 +305,11 @@ jobs: if: github.event_name != 'workflow_dispatch' with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }} - extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-i386 + extra-images: | + ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64, + ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8, + ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7, +# ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-i386 push: true # manifest for :1 tag (major release) @@ -313,7 +317,11 @@ jobs: uses: Noelware/docker-manifest-action@master with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }} - extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-i386 + extra-images: | + ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64, + ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8, + ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7, +# ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-i386 push: true # manifest for :latest tag @@ -321,7 +329,11 @@ jobs: uses: Noelware/docker-manifest-action@master with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }} - extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-i386 + extra-images: | + ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64, + ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8, + ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7, +# ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-i386 push: true @@ -399,7 +411,6 @@ jobs: name: Docker manifest needs: docker runs-on: ubuntu-22.04 - steps: - name: Log in to Docker Hub