From 0c589233b98c03ab099dae45cb5de0d3a6bc7838 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 14 Oct 2022 19:48:02 -0700 Subject: [PATCH] hgsgfdsfg --- README.md | 23 +++++++++++++---------- build-all | 8 ++++---- simple/awk.Dockerfile | 3 +++ simple/hello.Dockerfile | 3 +++ simple/sed.Dockerfile | 3 +++ 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 simple/awk.Dockerfile create mode 100644 simple/hello.Dockerfile create mode 100644 simple/sed.Dockerfile diff --git a/README.md b/README.md index a15432c..d6b1646 100644 --- a/README.md +++ b/README.md @@ -41,19 +41,18 @@ with some minor patches and a custom distrib. the cosmopolitan repository (i.e. first-class third-party support) the "flavor" used can be different than that of cosmo-bootstrap. - * **cosmo-assimilate:** converts Actually Portable Executables + * **cosmo-dist:** only contains the essentials from cosmo-bootstrap. + + * **rescue:** a minimal container used as a base + for many of the simple containers in phase 4. + +### Phase 4 + + * **assimilate:** converts Actually Portable Executables into native binaries. typically unnecessary, but sometimes nice. * **cosmo-awk:** Actually Portable awk (fork of One True Awk) - * **cosmo-dist:** only contains the essentials from cosmo-bootstrap. - - * **cosmo-make:** Landlocked Make (fork of GNU Make) - - * **cosmo-sed:** Actually Portable sed (fork of NetBSD sed) - -### Phase 4 - * **cosmo-base:** combines cosmo-dist, cosmo-assimilate, cosmo-awk, and cosmo-sed. this is used for building other containers. @@ -62,13 +61,17 @@ with some minor patches and a custom distrib. * **cosmo-lua:** Actually Portable Lua + * **cosmo-make:** Landlocked Make (fork of GNU Make) + * **cosmo-python:** Actually Portable Python 3.6.14 * **cosmo-quickjs:** quickjs (2021-03-27) + * **cosmo-sed:** Actually Portable sed (fork of NetBSD sed) + * **cosmo-sqlite:** sqlite3 (3350500) binaries and libraries. - * **cosmo-unbourne:** a fork of dash (v0.5.11.5) with extended interactivity. + * **unbourne:** a fork of dash (v0.5.11.5) with extended interactivity. ### Phase 5 diff --git a/build-all b/build-all index c2dd1ff..707e03e 100755 --- a/build-all +++ b/build-all @@ -55,10 +55,7 @@ build_simple() { : \ && build cosmo-bootstrap \ `# phase 3` \ && build cosmo-all \ - && build cosmo-assimilate \ - && build cosmo-awk \ && build cosmo-dist \ - && build cosmo-sed \ && build rescue \ `# phase 4` \ && build cosmo-base \ @@ -72,7 +69,7 @@ build_simple() { : \ && { [ ! -e cosmo-mini ] || build cosmo-mini ;} \ && { [ ! -e cosmo-python311 ] || build cosmo-python311 ;} \ \ - && yes_retrieve cosmo-base /cosmopolitan/bin/ape + && yes_retrieve cosmo-base /cosmopolitan/bin/ape \ && dbg_retrieve cosmo-kuroko /bin/kuroko.com \ && dbg_retrieve cosmo-muon /bin/muon.com \ && dbg_retrieve cosmo-perl /bin/perl.com \ @@ -81,6 +78,7 @@ build_simple() { : \ /bin/yices.com \ \ && dbg_retrieve assimilate /bin/assimilate.com \ + && dbg_retrieve awk /bin/awk.com \ && dbg_retrieve bd /bin/bd.com \ && dbg_retrieve bing /bin/bing.com /bin/unbing.com \ && dbg_retrieve blinkenlights /bin/blinkenlights.com \ @@ -91,6 +89,7 @@ build_simple() { : \ && dbg_retrieve cosmo-sqlite /bin/sqlite3.com \ && dbg_retrieve fold /bin/fold.com \ && dbg_retrieve greenbean /bin/greenbean.com \ + && dbg_retrieve hello /bin/hello.com \ && dbg_retrieve life /bin/life.com \ && dbg_retrieve memzoom /bin/memzoom.com \ && dbg_retrieve mkdeps /bin/mkdeps.com \ @@ -99,6 +98,7 @@ build_simple() { : \ && dbg_retrieve printvideo /bin/printvideo.com \ && dbg_retrieve quickjs /bin/qjs.com /bin/qjsc.com \ && dbg_retrieve redbean /bin/redbean.com \ + && dbg_retrieve sed /bin/sed.com \ && dbg_retrieve tinyemu /bin/tinyemu.com \ && dbg_retrieve unbourne /bin/unbourne.com \ && dbg_retrieve unveil /bin/unveil.com \ diff --git a/simple/awk.Dockerfile b/simple/awk.Dockerfile new file mode 100644 index 0000000..4a3544c --- /dev/null +++ b/simple/awk.Dockerfile @@ -0,0 +1,3 @@ +FROM rescue +COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/awk.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/awk.com"] diff --git a/simple/hello.Dockerfile b/simple/hello.Dockerfile new file mode 100644 index 0000000..45032c0 --- /dev/null +++ b/simple/hello.Dockerfile @@ -0,0 +1,3 @@ +FROM rescue +COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/hello.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/hello.com"] diff --git a/simple/sed.Dockerfile b/simple/sed.Dockerfile new file mode 100644 index 0000000..d543f4f --- /dev/null +++ b/simple/sed.Dockerfile @@ -0,0 +1,3 @@ +FROM rescue +COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sed.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/sed.com"]