From e32ec7cb046dd31fe4c15bd6ed1e1b62a264d238 Mon Sep 17 00:00:00 2001 From: KubaZ2 Date: Fri, 11 Oct 2024 00:32:52 +0200 Subject: [PATCH] Fix wrong image being selected on arm64 and optimize checked runtime image --- Backend/Sandbox/Asm/Dockerfile | 2 +- Backend/Sandbox/CheckedRuntime/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Backend/Sandbox/Asm/Dockerfile b/Backend/Sandbox/Asm/Dockerfile index f4b284d..dc065f9 100644 --- a/Backend/Sandbox/Asm/Dockerfile +++ b/Backend/Sandbox/Asm/Dockerfile @@ -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 diff --git a/Backend/Sandbox/CheckedRuntime/Dockerfile b/Backend/Sandbox/CheckedRuntime/Dockerfile index 2b2c156..35d81b8 100644 --- a/Backend/Sandbox/CheckedRuntime/Dockerfile +++ b/Backend/Sandbox/CheckedRuntime/Dockerfile @@ -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