fixes
This commit is contained in:
parent
23637a4e37
commit
faccc07bbf
2 changed files with 14 additions and 8 deletions
18
build-all
18
build-all
|
@ -24,11 +24,15 @@ dbg_retrieve() { : \
|
||||||
&& yes_retrieve "$container" "$@" \
|
&& 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() { : \
|
build() { : \
|
||||||
&& local t="${1?missing argument}" && shift \
|
&& local t="${1?missing argument}" && shift \
|
||||||
&& printf >&2 ' \033[1m\033[7m <-- \033[0m\033[1m ' \
|
&& announce building "$t" \
|
||||||
&& printf >&2 '%22sbuilding %-19s%13s' '' "$t" '' \
|
|
||||||
&& printf >&2 ' \033[1m\033[7m --> \033[0m\n' \
|
|
||||||
&& podman build -t "$t" "$t" "$@" \
|
&& podman build -t "$t" "$t" "$@" \
|
||||||
;}
|
;}
|
||||||
|
|
||||||
|
@ -49,9 +53,11 @@ build() { : \
|
||||||
&& build cosmo-base \
|
&& build cosmo-base \
|
||||||
&& for f in simple/*.Dockerfile \
|
&& for f in simple/*.Dockerfile \
|
||||||
;do : \
|
;do : \
|
||||||
&& g="${f%.*}" \
|
&& t="${f%.*}" t=${t##*/} \
|
||||||
&& podman build -t "${g##*/}" "$f" \
|
&& announce '(simple) packaging)' "$t" \
|
||||||
;done \
|
&& podman build -t "$t" -f "$f" simple \
|
||||||
|
|| exit \
|
||||||
|
;done ;\
|
||||||
`# phase 5` \
|
`# phase 5` \
|
||||||
&& build cosmo-kuroko \
|
&& build cosmo-kuroko \
|
||||||
&& build cosmo-muon \
|
&& build cosmo-muon \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
FROM scratch as runner
|
FROM scratch as runner
|
||||||
COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
|
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 /cosmopolitan/build/bootstrap/ape.elf /bin/ape
|
||||||
COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sqlite.* /bin/
|
COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sqlite3.* /bin/
|
||||||
ENTRYPOINT ["/bin/ape", "/bin/sqlite.com"]
|
ENTRYPOINT ["/bin/ape", "/bin/sqlite3.com"]
|
||||||
|
|
Loading…
Add table
Reference in a new issue