Skip to content

Commit

Permalink
Fix wrong image being selected on arm64 and optimize checked runtime …
Browse files Browse the repository at this point in the history
…image
  • Loading branch information
KubaZ2 committed Oct 10, 2024
1 parent 78e5c9d commit e32ec7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Backend/Sandbox/Asm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ COPY Backend/Sandbox/Asm Backend/Sandbox/Asm
RUN dotnet publish Backend/Sandbox/Asm/Asm.csproj -c Release -o /app

# 'docker buildx use default' is needed to use local 'ghcr.io/kubaz2/sharp/checked-runtime' image
FROM --platform=$BUILDPLATFORM ghcr.io/kubaz2/sharp/checked-runtime:$DOTNET_RUNTIME_VERSION AS checked-runtime
FROM ghcr.io/kubaz2/sharp/checked-runtime:$DOTNET_RUNTIME_VERSION AS checked-runtime

FROM mcr.microsoft.com/dotnet/runtime:$DOTNET_RUNTIME_VERSION-$OS_CODENAME AS runtime
ARG DOTNET_RUNTIME_VERSION
Expand Down
2 changes: 1 addition & 1 deletion Backend/Sandbox/CheckedRuntime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ RUN if [ $TARGETARCH = $BUILDARCH ]; then \
ROOTFS_DIR=/runtime/.tools/rootfs/$DOTNET_ARCH ./build.sh clr -c Checked -a $DOTNET_ARCH --cross; \
fi

FROM --platform=$BUILDPLATFORM busybox:latest AS storage
FROM scratch AS storage

COPY --from=build-env /runtime/artifacts/bin/coreclr/linux.*.*/libclrjit.so /runtime/libclrjit.so

0 comments on commit e32ec7c

Please sign in to comment.