Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/release-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
strategy:
matrix:
include:
- runner: ["self-hosted", "linux", "x64", "ubuntu-platform"]
- runner: ubuntu-24.04
platform: linux/amd64
- runner: ["self-hosted", "linux", "arm64", "ubuntu-platform"]
- runner: ubuntu-24.04
platform: linux/arm64
steps:
- name: Check out repo
Expand All @@ -54,6 +54,10 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
if: ${{ matrix.platform == 'linux/arm64' }}

- name: Build and push by digest
uses: ./.github/actions/docker
id: docker_build
Expand Down Expand Up @@ -134,6 +138,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Create manifest list and push
working-directory: ${{ env.DIGEST_DIR_PATH }}
run: |
Expand Down
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,7 @@ COPY --parents \
packages/check-features \
/platform/

RUN if [[ "${CARGO_BUILD_PROFILE}" == "release" ]] ; then \
export RELEASE="--release" ; \
fi && \
source $HOME/.cargo/env && \
RUN source $HOME/.cargo/env && \
source /root/env && \
cargo chef prepare $RELEASE --recipe-path recipe.json

Expand All @@ -335,7 +332,7 @@ SHELL ["/bin/bash", "-o", "pipefail","-e", "-x", "-c"]

WORKDIR /platform

COPY --from=build-planner /platform/recipe.json /platform/.cargo /platform/
COPY --from=build-planner --parents /platform/recipe.json /platform/.cargo /platform/

# Build dependencies - this is the caching Docker layer!
RUN --mount=type=cache,sharing=shared,id=cargo_registry_index,target=${CARGO_HOME}/registry/index \
Expand Down Expand Up @@ -427,7 +424,7 @@ FROM deps AS build-js

WORKDIR /platform

COPY --from=build-planner /platform/recipe.json recipe.json
COPY --from=build-planner --parents /platform/recipe.json recipe.json

# Build dependencies - this is the caching Docker layer!
RUN --mount=type=cache,sharing=shared,id=cargo_registry_index,target=${CARGO_HOME}/registry/index \
Expand Down
Loading