diff --git a/build-all b/build-all index 2f4f686..d3696c4 100755 --- a/build-all +++ b/build-all @@ -24,11 +24,15 @@ dbg_retrieve() { : \ && yes_retrieve "$container" "$@" \ ;} +announce() { : \ + && printf >&2 ' \033[1m\033[7m <-- \033[0m\033[1m ' \ + && printf >&2 ' %30s %-30s ' "$1" "$2" \ + && printf >&2 ' \033[1m\033[7m --> \033[0m\n' \ + ;} + build() { : \ && local t="${1?missing argument}" && shift \ - && printf >&2 ' \033[1m\033[7m <-- \033[0m\033[1m ' \ - && printf >&2 '%22sbuilding %-19s%13s' '' "$t" '' \ - && printf >&2 ' \033[1m\033[7m --> \033[0m\n' \ + && announce building "$t" \ && podman build -t "$t" "$t" "$@" \ ;} @@ -49,9 +53,11 @@ build() { : \ && build cosmo-base \ && for f in simple/*.Dockerfile \ ;do : \ - && g="${f%.*}" \ - && podman build -t "${g##*/}" "$f" \ - ;done \ + && t="${f%.*}" t=${t##*/} \ + && announce '(simple) packaging)' "$t" \ + && podman build -t "$t" -f "$f" simple \ + || exit \ + ;done ;\ `# phase 5` \ && build cosmo-kuroko \ && build cosmo-muon \ diff --git a/simple/cosmo-sqlite.Dockerfile b/simple/cosmo-sqlite.Dockerfile index 1be31e6..f0c5606 100644 --- a/simple/cosmo-sqlite.Dockerfile +++ b/simple/cosmo-sqlite.Dockerfile @@ -1,5 +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/sqlite.* /bin/ -ENTRYPOINT ["/bin/ape", "/bin/sqlite.com"] +COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sqlite3.* /bin/ +ENTRYPOINT ["/bin/ape", "/bin/sqlite3.com"]