Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
Connor Olding | 6b91f1ae1c | ||
Connor Olding | 47c18a97d5 | ||
Connor Olding | 74ddf3ee4f | ||
Connor Olding | 11c9578382 | ||
Connor Olding | 882cb4e80f | ||
Connor Olding | b2f2f13943 | ||
Connor Olding | 16ce669c8e | ||
Connor Olding | 1c0dffa857 | ||
Connor Olding | 4b9b114c89 | ||
Connor Olding | f4f6bc7b84 |
1
TODO.md
1
TODO.md
|
@ -14,7 +14,6 @@ remove elements from this list as you see fit.
|
|||
* for source being built
|
||||
* for exposed containers
|
||||
* for `install-cosmo` (kinda a subset of the previous point)
|
||||
* cosmo: allow non-default builds (`rel`, `dbg`, etc.)
|
||||
* kuroko: test more vigorously
|
||||
* do tests pass on a Windows host?
|
||||
* kuroko: use cosmopolitan readline functionality instead of built-in?
|
||||
|
|
|
@ -18,7 +18,7 @@ RUN : \
|
|||
COSMO "$PWD" \
|
||||
COSMO_DIST "$PWD/dist/$COSMO_FLAVOR" \
|
||||
\
|
||||
&& shed expand "s_o='o/[^']*'_o='o/$mode'_g" \
|
||||
&& shed expand "s_o='o/[^']*'_o='o/$mode' _g" \
|
||||
;
|
||||
|
||||
RUN --mount=type=tmpfs,target=/tmp : \
|
||||
|
@ -29,13 +29,15 @@ RUN --mount=type=tmpfs,target=/tmp : \
|
|||
&& rm -r o.old \
|
||||
;fi \
|
||||
\
|
||||
# skip some checks that are currently failing: \
|
||||
&& skip() { mkdir -p "${1%/*}" && touch -d @2222222222 "$1" ;} \
|
||||
&& skip "o/$mode/test/libc/calls/ftruncate_test.com.runs" \
|
||||
# skip some checks that fail under podman: \
|
||||
&& skip "o/$mode/test/libc/calls/getgroups_test.com.runs" \
|
||||
&& skip "o/$mode/test/libc/calls/getpriority_test.com.runs" \
|
||||
# these can fail in nested podman: \
|
||||
# these can fail when nesting podman: \
|
||||
&& shed test/libc/calls/ftruncate_test.c '/\.st_blocks/d' \
|
||||
&& skip "o/$mode/test/libc/stdio/tmpfile_test.com.runs" \
|
||||
&& skip "o/$mode/test/tool/net/lunix_test.lua.runs" \
|
||||
&& skip "o/$mode/third_party/python/Lib/test/test_selectors.py.runs" \
|
||||
# FIXME: SIGSEGV: \
|
||||
&& skip "o/$mode/third_party/python/Lib/test/test_ioctl.py.runs" \
|
||||
\
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# MAIN: https://justine.lol/cosmopolitan/
|
||||
# REPO: https://github.com/jart/cosmopolitan
|
||||
ARG COSMO_FLAVOR=def
|
||||
ARG COSMO_COMMIT=648bf6555c06a3655cab1a9ae078d329c192d39a
|
||||
ARG COSMO_SHA256=5310a718494420cda5895cb67d56413f8b051fce37eb83c463a756a13dbef30d
|
||||
ARG COSMO_COMMIT=ef9776755ee3646029624fe30de5d58a3c03f6f6
|
||||
ARG COSMO_SHA256=f5efa2daf12f0536a4d57b4da5f7402398bb93ae2d5e602c2401b3a6227af1c4
|
||||
ARG COSMO_REBUILD=0
|
||||
|
||||
FROM localhost/notwa-util AS downloader
|
||||
|
@ -12,7 +12,7 @@ RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
|
|||
&& acquire from=github repo=jart/cosmopolitan dest=/cosmopolitan env=COSMO \
|
||||
;
|
||||
|
||||
FROM alpine:3.16 AS builder
|
||||
FROM docker.io/library/alpine:3.16 AS builder
|
||||
ARG COSMO_FLAVOR COSMO_COMMIT
|
||||
COPY --from=downloader /cosmopolitan /cosmopolitan
|
||||
WORKDIR /cosmopolitan
|
||||
|
@ -20,7 +20,6 @@ WORKDIR /cosmopolitan
|
|||
# tell makefiles to be less noisy, also use /tmp:
|
||||
ENV V=0 COLUMNS=80 TMPDIR=/tmp
|
||||
|
||||
COPY --chmod=0755 make.com build/bootstrap/make.com
|
||||
COPY --chmod=0755 --from=localhost/notwa-util /nu/shed /usr/bin/
|
||||
RUN : \
|
||||
# allow optimized builds to be more portable, so the container is too. \
|
||||
|
|
Binary file not shown.
|
@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/tmp : \
|
|||
&& cp /cosmopolitan/env /distrib/env \
|
||||
;
|
||||
|
||||
FROM alpine:3.16 AS runner
|
||||
FROM docker.io/library/alpine:3.16 AS runner
|
||||
COPY --from=distrib /distrib /cosmopolitan
|
||||
ENV PATH="/cosmopolitan/bin:/cosmopolitan/gcc/bin/:/cosmopolitan/gcc/x86_64-linux-musl/bin/:$PATH"
|
||||
# FIXME:
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
# TODO: add /zip/ support by default and include dist modules.
|
||||
|
||||
FROM localhost/notwa-util AS downloader
|
||||
ARG KUROKO_COMMIT=3f35d89fff2343ddb9f0de5c87bbdefa86ee34f5
|
||||
ARG KUROKO_SHA256=b1d38c48afdc06633d848dc27cb5d37bebbb7c99c59d3649c155350f06cd93a7
|
||||
ARG KUROKO_COMMIT=f4b40b1b7015c0d421edb508144b4a22b2321d46
|
||||
ARG KUROKO_SHA256=d72e1b3bb7400d7c2e47dd97120b64890998c90ccb13cb3f7cd16429a584f41c
|
||||
|
||||
RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
|
||||
--mount=type=tmpfs,target=/tmp : \
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# MAIN: https://muon.build/
|
||||
# REPO: https://git.sr.ht/~lattis/muon
|
||||
FROM localhost/notwa-util AS downloader
|
||||
ARG MUON_COMMIT=40bf3553f49a784639b06867acff20b702d7956d
|
||||
ARG MUON_SHA256=baef4d22d29807023883c843825a6e514aba54256a8727fadfbabcf983385416
|
||||
ARG MUON_COMMIT=cdb84257b50ebdeddd1ea696fe433e4a3316c8a9
|
||||
ARG MUON_SHA256=c8104d857ccaea09ddb6e9a83c73b4a061550c1257f7673c904a137d8a716f04
|
||||
RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
|
||||
--mount=type=tmpfs,target=/tmp : \
|
||||
&& acquire from=sourcehut repo=lattis/muon dest=/muon env=MUON \
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
&& { [ -w . ] || "$super" chown root:wheel . ;} \
|
||||
&& { [ -w . ] || "$super" chmod 0775 . ;} \
|
||||
&& now="$(date -u +%s)" \
|
||||
&& podman run -v="$out":/out --rm localhost/cosmo \
|
||||
&& podman run -v="$out":/out --rm localhost/cosmo-dist \
|
||||
tar zcf "/out/cosmopolitan-$now.tar.gz" /cosmopolitan \
|
||||
&& if [ -L cosmopolitan ] \
|
||||
;then : \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# MAIN: https://eaguru.guru/git/notwa/stargazing
|
||||
# REPO: https://eaguru.guru/git/notwa/stargazing
|
||||
FROM alpine:3.16 as partial
|
||||
FROM docker.io/library/alpine:3.16 as partial
|
||||
# need this for acquire (.tar.xz files):
|
||||
RUN apk add --no-cache xz
|
||||
COPY --chmod=0755 acquire cosmocc dedupe ofc quickconf shed \
|
||||
|
@ -23,7 +23,7 @@ RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
|
|||
&& acquire \
|
||||
;
|
||||
|
||||
FROM alpine:3.16 as builder
|
||||
FROM docker.io/library/alpine:3.16 as builder
|
||||
RUN apk add --no-cache gcc linux-headers make musl-dev
|
||||
# configure and build a rescue shell and some utilities,
|
||||
# i.e. one better suited for images built "FROM scratch".
|
||||
|
|
Loading…
Reference in New Issue
Block a user