From 3d0a38cbb8719f37defc75db08ca71d3a925e6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Wed, 23 Oct 2024 14:08:29 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20arm=20=E5=B9=B3=E5=8F=B0=E7=9A=84=E5=AE=B9=E5=99=A8=E4=B8=8B?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 29 ++++++++++++++++++++++++----- Dockerfile | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f006992..d3748e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,9 @@ on: - "*" workflow_dispatch: +env: + TEST_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:${{ github.ref_name }} + jobs: build-image: runs-on: ubuntu-latest @@ -14,21 +17,37 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and export to Docker + uses: docker/build-push-action@v6 + with: + context: . + platforms: linux/amd64,linux/arm64,linux/arm/v7 + load: true + tags: ${{ env.TEST_TAG }} + + - name: Test + run: | + docker run --rm ${{ env.TEST_TAG }} -h + - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:${{ github.ref_name }} + tags: ${{ env.TEST_TAG }} + - name: Docker Hub Description uses: peter-evans/dockerhub-description@v4 with: diff --git a/Dockerfile b/Dockerfile index cf090f4..ac03f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ FROM python:3.10-slim RUN apt-get update && apt-get install -y \ libtiff6 \ + libopenjp2-7 \ && rm -rf /var/lib/apt/lists/* WORKDIR /app