diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 785794d4..562ab71c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,6 +3,7 @@ on: push: branches: - main + jobs: build-app: runs-on: ubuntu-latest @@ -12,33 +13,15 @@ jobs: - service_name: ui file: frontend/Dockerfile context: ./frontend - arch: amd64 - platform: linux/amd64 + platform: linux/amd64,linux/arm64 - service_name: app file: docker/Dockerfile.app context: . - arch: amd64 - platform: linux/amd64 + platform: linux/amd64,linux/arm64 - service_name: docreader file: docker/Dockerfile.docreader context: . - arch: amd64 - platform: linux/amd64 - - service_name: ui - file: frontend/Dockerfile - context: ./frontend - arch: arm64 - platform: linux/arm64 - - service_name: app - file: docker/Dockerfile.app - context: . - arch: arm64 - platform: linux/arm64 - - service_name: docreader - file: docker/Dockerfile.docreader - context: . - arch: arm64 - platform: linux/arm64 + platform: linux/amd64,linux/arm64 steps: - name: Checkout code uses: actions/checkout@v3 @@ -62,6 +45,4 @@ jobs: platforms: ${{ matrix.platform }} file: ${{ matrix.file }} context: ${{ matrix.context }} - tags: ${{ secrets.DOCKERHUB_USERNAME }}/weknora-${{ matrix.service_name }}:${{ matrix.arch }}-latest - build-args: | - PLATFORM=${{ matrix.platform }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/weknora-${{ matrix.service_name }}:latest diff --git a/docker/Dockerfile.docreader b/docker/Dockerfile.docreader index e9c2faee..6cc9433a 100644 --- a/docker/Dockerfile.docreader +++ b/docker/Dockerfile.docreader @@ -1,9 +1,7 @@ -ARG PLATFORM=linux/amd64 - # ========================= # 构建阶段 # ========================= -FROM --platform=${PLATFORM} python:3.10.18-bookworm AS builder +FROM python:3.10.18-bookworm AS builder # 切换 apt 源到清华 RUN sed -i 's@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g' /etc/apt/sources.list.d/debian.sources && \ @@ -63,7 +61,7 @@ RUN chmod +x /app/scripts/generate_proto.sh && bash /app/scripts/generate_proto. # ========================= # 运行阶段 # ========================= -FROM --platform=${PLATFORM} python:3.10.18-bookworm AS runner +FROM python:3.10.18-bookworm AS runner # 切换 apt 源到清华 RUN sed -i 's@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g' /etc/apt/sources.list.d/debian.sources && \