From 9623c952dc7037eda0b084e53314dba0e7615526 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Fri, 14 Oct 2022 17:02:50 -0700
Subject: [PATCH] copy unbourne from cosmo-all

---
 cosmo-all/Dockerfile      |  5 +++++
 cosmo-unbourne/Dockerfile | 11 ++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cosmo-all/Dockerfile b/cosmo-all/Dockerfile
index 38d9ba7..cbc2077 100644
--- a/cosmo-all/Dockerfile
+++ b/cosmo-all/Dockerfile
@@ -31,4 +31,9 @@ RUN --mount=type=cache,id=cosmo-build-all,target=/cosmopolitan/o,sharing=locked
  && touch o//test/libc/calls/getpriority_test.com.runs \
 \
  && ./makeit MODE="$mode" all \
+\
+# install the binaries somewhere so we can retrieve them without mounting cache: \
+ && find o '(' -name '*.com' -o -name '*.com.dbg' ')' -exec \
+    install -m0755 -t /usr/local/bin {} \
+    + \
 ;
diff --git a/cosmo-unbourne/Dockerfile b/cosmo-unbourne/Dockerfile
index bcdd577..1ad49c7 100644
--- a/cosmo-unbourne/Dockerfile
+++ b/cosmo-unbourne/Dockerfile
@@ -1,12 +1,5 @@
-FROM cosmo-bootstrap AS builder
-RUN --mount=type=tmpfs,target=/tmp : \
- && . ./env \
- && ./expand ./makeit e//unbourne.com \
- && ./expand cp -t /usr/bin e//unbourne.com e//unbourne.com.dbg \
-;
-
 FROM scratch AS runner
 COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=builder /cosmopolitan/build/bootstrap/ape.elf /bin/ape
-COPY --chmod=0755 --from=builder /usr/bin/unbourne.com /usr/bin/unbourne.com.dbg /bin/
+COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/unbourne.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/unbourne.com"]