diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml index b8aef9b3b..fcbd788b5 100644 --- a/.github/workflows/build-base-image.yml +++ b/.github/workflows/build-base-image.yml @@ -37,13 +37,12 @@ jobs: run: echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV - name: Build and push multi-arch image - run: | - DOCKER_BUILDKIT=1 docker buildx build \ - --platform linux/amd64,linux/arm64 \ - -f Dockerfile-base \ - -t jumpserver/${{ env.REPO }}-base:${{ env.IMAGE_TAG }} \ - --build-arg BUILDKIT_INLINE_CACHE=1 \ - --push . + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64 + push: true + file: Dockerfile-base + tags: jumpserver/${{ env.REPO }}-base:${{ env.IMAGE_TAG }} - name: Update Dockerfile run: | diff --git a/Dockerfile-base b/Dockerfile-base index 79245f278..a84180b37 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -15,5 +15,6 @@ RUN set -ex \ WORKDIR /data COPY package.json yarn.lock ./ + RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=yarn-cache \ yarn install