From 17f27ecac94cefaf74b9892ee4a1ac7de827ab83 Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Sat, 13 Jul 2024 22:19:02 +0800 Subject: [PATCH] feat: fast build linux/arm64 frontend --- .github/workflows/docker-image-arm64.yml | 69 ------------------- ...image-amd64-en.yml => docker-image-en.yml} | 3 +- ...ocker-image-amd64.yml => docker-image.yml} | 3 +- Dockerfile | 2 +- 4 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/docker-image-arm64.yml rename .github/workflows/{docker-image-amd64-en.yml => docker-image-en.yml} (94%) rename .github/workflows/{docker-image-amd64.yml => docker-image.yml} (95%) diff --git a/.github/workflows/docker-image-arm64.yml b/.github/workflows/docker-image-arm64.yml deleted file mode 100644 index dc2b4b97ce..0000000000 --- a/.github/workflows/docker-image-arm64.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Publish Docker image (arm64) - -on: - push: - tags: - - 'v*.*.*' - - '!*-alpha*' - workflow_dispatch: - inputs: - name: - description: 'reason' - required: false -jobs: - push_to_registries: - name: Push Docker image to multiple registries - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Check repository URL - run: | - REPO_URL=$(git config --get remote.origin.url) - if [[ $REPO_URL == *"pro" ]]; then - exit 1 - fi - - - name: Save version info - run: | - git describe --tags > VERSION - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Log in to the Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v4 - with: - images: | - justsong/one-api - ghcr.io/${{ github.repository }} - - - name: Build and push Docker images - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/docker-image-amd64-en.yml b/.github/workflows/docker-image-en.yml similarity index 94% rename from .github/workflows/docker-image-amd64-en.yml rename to .github/workflows/docker-image-en.yml index 31c01e8001..e894448fc6 100644 --- a/.github/workflows/docker-image-amd64-en.yml +++ b/.github/workflows/docker-image-en.yml @@ -1,4 +1,4 @@ -name: Publish Docker image (amd64, English) +name: Publish Docker image (English) on: push: @@ -51,6 +51,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/docker-image-amd64.yml b/.github/workflows/docker-image.yml similarity index 95% rename from .github/workflows/docker-image-amd64.yml rename to .github/workflows/docker-image.yml index 1b9983c608..572241354e 100644 --- a/.github/workflows/docker-image-amd64.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Publish Docker image (amd64) +name: Publish Docker image on: push: @@ -56,6 +56,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 29b4ca71cc..8154e4dcce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 as builder +FROM --platform=$BUILDPLATFORM node:16 as builder WORKDIR /web COPY ./VERSION .