From 23637a4e37fd232c334e28223b86779ab2530e78 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 14 Oct 2022 18:02:21 -0700 Subject: [PATCH] simplify --- build-all | 12 +++++------- cosmo-make/Dockerfile | 5 ----- simple/blinkenlights.Dockerfile | 5 +++++ .../Dockerfile => simple/cosmo-chibicc.Dockerfile | 0 cosmo-lua/Dockerfile => simple/cosmo-lua.Dockerfile | 0 simple/cosmo-make.Dockerfile | 5 +++++ .../Dockerfile => simple/cosmo-python.Dockerfile | 0 .../Dockerfile => simple/cosmo-sqlite.Dockerfile | 0 .../Dockerfile => simple/cosmo-unbourne.Dockerfile | 0 simple/memzoom.Dockerfile | 5 +++++ simple/unveil.Dockerfile | 5 +++++ 11 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 cosmo-make/Dockerfile create mode 100644 simple/blinkenlights.Dockerfile rename cosmo-chibicc/Dockerfile => simple/cosmo-chibicc.Dockerfile (100%) rename cosmo-lua/Dockerfile => simple/cosmo-lua.Dockerfile (100%) create mode 100644 simple/cosmo-make.Dockerfile rename cosmo-python/Dockerfile => simple/cosmo-python.Dockerfile (100%) rename cosmo-sqlite/Dockerfile => simple/cosmo-sqlite.Dockerfile (100%) rename cosmo-unbourne/Dockerfile => simple/cosmo-unbourne.Dockerfile (100%) create mode 100644 simple/memzoom.Dockerfile create mode 100644 simple/unveil.Dockerfile diff --git a/build-all b/build-all index d8951de..2f4f686 100755 --- a/build-all +++ b/build-all @@ -44,16 +44,14 @@ build() { : \ && build cosmo-assimilate \ && build cosmo-awk \ && build cosmo-dist \ - && build cosmo-make \ && build cosmo-sed \ `# phase 4` \ && build cosmo-base \ - && build cosmo-chibicc \ - && build cosmo-lua \ - && build cosmo-python \ - && build cosmo-quickjs \ - && build cosmo-sqlite \ - && build cosmo-unbourne \ + && for f in simple/*.Dockerfile \ + ;do : \ + && g="${f%.*}" \ + && podman build -t "${g##*/}" "$f" \ + ;done \ `# phase 5` \ && build cosmo-kuroko \ && build cosmo-muon \ diff --git a/cosmo-make/Dockerfile b/cosmo-make/Dockerfile deleted file mode 100644 index 479216f..0000000 --- a/cosmo-make/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM scratch AS runner -COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox -COPY --chmod=0755 --from=localhost/cosmo-dist /cosmopolitan/bin/ape /bin/ -COPY --chmod=0755 --from=localhost/cosmo-dist /cosmopolitan/bin/make.com /bin/ -ENTRYPOINT ["/bin/ape", "/bin/make.com"] diff --git a/simple/blinkenlights.Dockerfile b/simple/blinkenlights.Dockerfile new file mode 100644 index 0000000..fe0ad24 --- /dev/null +++ b/simple/blinkenlights.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/blinkenlights.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/blinkenlights.com"] diff --git a/cosmo-chibicc/Dockerfile b/simple/cosmo-chibicc.Dockerfile similarity index 100% rename from cosmo-chibicc/Dockerfile rename to simple/cosmo-chibicc.Dockerfile diff --git a/cosmo-lua/Dockerfile b/simple/cosmo-lua.Dockerfile similarity index 100% rename from cosmo-lua/Dockerfile rename to simple/cosmo-lua.Dockerfile diff --git a/simple/cosmo-make.Dockerfile b/simple/cosmo-make.Dockerfile new file mode 100644 index 0000000..12e2406 --- /dev/null +++ b/simple/cosmo-make.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/make.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/make.com"] diff --git a/cosmo-python/Dockerfile b/simple/cosmo-python.Dockerfile similarity index 100% rename from cosmo-python/Dockerfile rename to simple/cosmo-python.Dockerfile diff --git a/cosmo-sqlite/Dockerfile b/simple/cosmo-sqlite.Dockerfile similarity index 100% rename from cosmo-sqlite/Dockerfile rename to simple/cosmo-sqlite.Dockerfile diff --git a/cosmo-unbourne/Dockerfile b/simple/cosmo-unbourne.Dockerfile similarity index 100% rename from cosmo-unbourne/Dockerfile rename to simple/cosmo-unbourne.Dockerfile diff --git a/simple/memzoom.Dockerfile b/simple/memzoom.Dockerfile new file mode 100644 index 0000000..57dcf48 --- /dev/null +++ b/simple/memzoom.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/memzoom.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/memzoom.com"] diff --git a/simple/unveil.Dockerfile b/simple/unveil.Dockerfile new file mode 100644 index 0000000..de48f09 --- /dev/null +++ b/simple/unveil.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/unveil.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/unveil.com"]