From 1dba3bb8de0b7884422b7c4436bc8726082abc60 Mon Sep 17 00:00:00 2001 From: zen Date: Tue, 2 Jul 2024 11:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E5=88=AB=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=8D=E5=90=8C=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._image.yml => docker_push_amd64_image.yml} | 15 ++------- .github/workflows/docker_push_arm64_image.yml | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 12 deletions(-) rename .github/workflows/{docker_push_image.yml => docker_push_amd64_image.yml} (65%) create mode 100644 .github/workflows/docker_push_arm64_image.yml diff --git a/.github/workflows/docker_push_image.yml b/.github/workflows/docker_push_amd64_image.yml similarity index 65% rename from .github/workflows/docker_push_image.yml rename to .github/workflows/docker_push_amd64_image.yml index 4cc8455..faebc67 100644 --- a/.github/workflows/docker_push_image.yml +++ b/.github/workflows/docker_push_amd64_image.yml @@ -1,4 +1,4 @@ -name: Publish Docker Image +name: Publish amd64 Docker Image on: push: @@ -8,16 +8,11 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - strategy: - matrix: - platform: [ linux/amd64, linux/arm64 ] steps: - name: Checkout repository uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -28,14 +23,10 @@ jobs: uses: docker/metadata-action@v5 with: images: zhangyiming748/convert_images - tags: | - type=semver,pattern={{version}} - type=sha - name: Build and push Docker image uses: docker/build-push-action@v5 with: context: . push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - platforms: ${{ matrix.platform }} + tags: ${{ steps.meta.outputs.tags }}-amd64 + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/docker_push_arm64_image.yml b/.github/workflows/docker_push_arm64_image.yml new file mode 100644 index 0000000..498495c --- /dev/null +++ b/.github/workflows/docker_push_arm64_image.yml @@ -0,0 +1,32 @@ +name: Publish amd64 Docker Image + +on: + push: + tags: + - 'v*' + +jobs: + build-and-push: + runs-on: arm64-linux + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: zhangyiming748/convert_images + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }}-arm64 + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file