diff --git a/.github/docker/alpine/Dockerfile b/.github/docker/alpine/Dockerfile index b4cf4b8c2d..f3943312ba 100644 --- a/.github/docker/alpine/Dockerfile +++ b/.github/docker/alpine/Dockerfile @@ -2,8 +2,7 @@ ARG BASE=alpine:latest FROM ${BASE} -RUN apk update -RUN apk add \ +RUN apk add --no-cache \ bash \ build-base \ cargo \ @@ -17,6 +16,9 @@ RUN apk add \ lsb-release-minimal \ mitmproxy \ moreutils \ + nodejs \ + npm \ + openssl-dev \ perl \ powershell \ python3 \ diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d62b27b9dc..2a34976031 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,6 +17,7 @@ jobs: matrix: version: - '3.21' + - '3.23' permissions: contents: read @@ -34,9 +35,15 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build ${{ env.IMAGE_NAME }} - run: docker build --build-arg BASE=alpine:${{ matrix.version }} -t ${{ env.IMAGE_NAME }} . - working-directory: .github/docker/alpine + - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - - name: Push ${{ env.IMAGE_NAME }} - run: docker push ${{ env.IMAGE_NAME }} + - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + + - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + with: + push: true + platforms: linux/amd64,linux/arm64 + tags: ${{ env.IMAGE_NAME }} + context: .github/docker/alpine + build-args: | + BASE=alpine:${{ matrix.version }}