From 9c764ae25e98fc409fad5e5376eae4a3c5c8eb8e Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Wed, 13 Mar 2024 22:29:50 +0800 Subject: [PATCH] chore: avoid copying full rootfs (use cache) when base changed --- Runner.Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Runner.Dockerfile b/Runner.Dockerfile index 9836ca4..fa3dfc3 100644 --- a/Runner.Dockerfile +++ b/Runner.Dockerfile @@ -18,12 +18,6 @@ RUN apt-get update && apt-get upgrade -y \ && apt-get install -y ca-certificates libnl-route-3-200 libprotobuf32 tini \ && apt-get clean && rm -rf /var/lib/apt/lists -# sources -COPY --from=base /builder/resource/runner /app/resource/runner -COPY --from=base /builder/config.docker.yaml /app -COPY --from=base /builder/docker-entrypoint.sh /app -COPY --from=base /builder/woj /app - # rootfs COPY --from=rootfs-full / /app/resource/runner/framework/rootfs/full COPY --from=rootfs-run / /app/resource/runner/framework/rootfs/run @@ -31,5 +25,11 @@ COPY --from=rootfs-run / /app/resource/runner/framework/rootfs/run # nsjail COPY --from=rootfs-full /woj/framework/scripts/nsjail /app/resource/runner/framework/scripts/nsjail +# sources +COPY --from=base /builder/resource/runner /app/resource/runner +COPY --from=base /builder/config.docker.yaml /app +COPY --from=base /builder/docker-entrypoint.sh /app +COPY --from=base /builder/woj /app + # reap zombies ENTRYPOINT ["/usr/bin/tini", "/app/docker-entrypoint.sh"]