From 3a0538a6ccb66f1029612fcdc6fab0013a1134b6 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 14 Oct 2022 18:38:42 -0700 Subject: [PATCH] stuff --- build-all | 30 ++++++++++++++----- simple/pledge.Dockerfile | 5 ++++ ...nbourne.Dockerfile => unbourne.Dockerfile} | 0 3 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 simple/pledge.Dockerfile rename simple/{cosmo-unbourne.Dockerfile => unbourne.Dockerfile} (100%) diff --git a/build-all b/build-all index d3696c4..2babfc4 100755 --- a/build-all +++ b/build-all @@ -36,6 +36,16 @@ build() { : \ && podman build -t "$t" "$t" "$@" \ ;} +build_simple() { : \ + && for f in simple/*.Dockerfile \ + ;do : \ + && t="${f%.*}" t=${t##*/} \ + && announce '(simple) packaging)' "$t" \ + && podman build -t "$t" -f "$f" simple \ + || return \ + ;done \ + ;} + : \ && me="$(readlink -f "$0")" && cd "${me%/*}" && { [ -d out ] || mkdir out ;} \ ;: \ @@ -51,13 +61,7 @@ build() { : \ && build cosmo-sed \ `# phase 4` \ && build cosmo-base \ - && for f in simple/*.Dockerfile \ - ;do : \ - && t="${f%.*}" t=${t##*/} \ - && announce '(simple) packaging)' "$t" \ - && podman build -t "$t" -f "$f" simple \ - || exit \ - ;done ;\ + && build_simple \ `# phase 5` \ && build cosmo-kuroko \ && build cosmo-muon \ @@ -73,7 +77,17 @@ build() { : \ && dbg_retrieve cosmo-kuroko /bin/kuroko.com \ && dbg_retrieve cosmo-muon /bin/muon.com \ && dbg_retrieve cosmo-perl /bin/perl.com \ - && yes_retrieve cosmo-unbourne /bin/unbourne.com \ && dbg_retrieve cosmo-yices /bin/kissat.com /bin/yices-sat.com \ /bin/yices-smt.com /bin/yices-smt2.com /bin/yices.com \ +\ + && dbg_retrieve blinkenlights /bin/blinkenlights.com \ + && dbg_retrieve cosmo-chibicc /bin/chibicc.com \ + && dbg_retrieve cosmo-lua /bin/lua.com /bin/luac.com \ + && dbg_retrieve cosmo-make /bin/make.com \ + && dbg_retrieve cosmo-python /bin/python.com \ + && dbg_retrieve cosmo-sqlite /bin/sqlite3.com \ + && dbg_retrieve memzoom /bin/memzoom.com \ + && dbg_retrieve pledge /bin/pledge.com \ + && dbg_retrieve unbourne /bin/unbourne.com \ + && dbg_retrieve unveil /bin/unveil.com \ ; diff --git a/simple/pledge.Dockerfile b/simple/pledge.Dockerfile new file mode 100644 index 0000000..21ca406 --- /dev/null +++ b/simple/pledge.Dockerfile @@ -0,0 +1,5 @@ +FROM scratch as runner +COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox +COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape +COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/pledge.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/pledge.com"] diff --git a/simple/cosmo-unbourne.Dockerfile b/simple/unbourne.Dockerfile similarity index 100% rename from simple/cosmo-unbourne.Dockerfile rename to simple/unbourne.Dockerfile