From 76456e8ea20c1e863c9f2a28adac8b445de386f9 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sat, 15 Oct 2022 01:28:37 -0700 Subject: [PATCH] kuroko, muon, perl, yices: use rescue container --- cosmo-kuroko/Dockerfile | 4 +--- cosmo-muon/Dockerfile | 4 +--- cosmo-perl/Dockerfile | 4 +--- cosmo-yices/Dockerfile | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cosmo-kuroko/Dockerfile b/cosmo-kuroko/Dockerfile index e97b92f..9fe5c16 100644 --- a/cosmo-kuroko/Dockerfile +++ b/cosmo-kuroko/Dockerfile @@ -123,9 +123,7 @@ RUN : \ ; RUN make.com test -FROM scratch AS runner -COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox -COPY --chmod=0755 --from=builder /cosmopolitan/bin/ape /bin/ape +FROM localhost/rescue AS runner COPY --chmod=0755 --from=builder /kuroko/kuroko.com /kuroko/kuroko.com.dbg /bin/ COPY --from=builder /kuroko.patch /var/local/kuroko.patch ENTRYPOINT ["/bin/ape", "/bin/kuroko.com"] diff --git a/cosmo-muon/Dockerfile b/cosmo-muon/Dockerfile index ee66cfe..49feb4a 100644 --- a/cosmo-muon/Dockerfile +++ b/cosmo-muon/Dockerfile @@ -45,8 +45,6 @@ RUN : \ && objcopy -S -O binary muon.com.dbg muon.com \ ; -FROM scratch AS runner -COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox -COPY --chmod=0755 --from=builder /cosmopolitan/bin/ape /bin/ape +FROM localhost/rescue AS runner COPY --chmod=0755 --from=builder /muon/build/muon.com /muon/build/muon.com.dbg /bin/ ENTRYPOINT ["/bin/ape", "/bin/muon.com"] diff --git a/cosmo-perl/Dockerfile b/cosmo-perl/Dockerfile index 6eacd83..5eef540 100644 --- a/cosmo-perl/Dockerfile +++ b/cosmo-perl/Dockerfile @@ -129,9 +129,7 @@ RUN : \ && mv ../perl.com ../../perl.com \ ; -FROM scratch AS runner -COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox -COPY --chmod=0755 --from=builder /cosmopolitan/bin/ape /bin/ape +FROM localhost/rescue AS runner COPY --chmod=0755 --from=builder /perl/cosmo/o/perl.com /bin/perl.com COPY --chmod=0755 --from=builder /perl/perl.elf /bin/perl.com.dbg COPY --from=builder /perl/minitest_results.txt /minitest_results.txt diff --git a/cosmo-yices/Dockerfile b/cosmo-yices/Dockerfile index c3366c3..f47577e 100644 --- a/cosmo-yices/Dockerfile +++ b/cosmo-yices/Dockerfile @@ -110,9 +110,7 @@ RUN : \ && objcopy -S -O binary "kissat.com.dbg" "kissat.com" \ ; -FROM scratch AS runner -COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox -COPY --chmod=0755 --from=builder /cosmopolitan/bin/ape /bin/ape +FROM localhost/rescue AS runner COPY --from=builder /yices/config.cache /yices/config.log /yices/config.status /var/local/ COPY --from=builder /yices/dist/bin /bin COPY --chmod=0755 --from=builder /kissat/build/kissat.com /kissat/build/kissat.com.dbg /bin/