From 8346d12f629a8c155e8705ab85e17b9d1cd00a0c Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Thu, 8 Feb 2024 09:15:10 -0800 Subject: [PATCH] simple names in bootstrap to rely on build-context --- src/bootstrap/stage1/Containerfile | 4 ++-- src/bootstrap/stage2/Containerfile | 4 ++-- src/bootstrap/stage3/Containerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/stage1/Containerfile b/src/bootstrap/stage1/Containerfile index c52ad0b..1d800e9 100644 --- a/src/bootstrap/stage1/Containerfile +++ b/src/bootstrap/stage1/Containerfile @@ -258,7 +258,7 @@ ADD --checksum=sha256:b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f8 # HACK: stage0 tar is currently incompatible with symlinks and github tgz files #FROM base as extract -#COPY --from=stagex/stage0 . / +#COPY --from=stage0 . / #COPY --from=fetch distfiles/live-bootstrap.tgz . #SHELL ["/x86/bin/kaem","--verbose","--strict","--file"] #COPY <<-EOF extract.kaem @@ -277,7 +277,7 @@ RUN echo "" > lrvick-live-bootstrap-fc6eeb6/steps/lwext4-1.0.0-lb1/files/fiwix-f FROM base as build USER 0:0 -COPY --from=stagex/stage0 . / +COPY --from=stage0 . / COPY --from=fetch distfiles external/distfiles COPY --from=extract /lrvick-live-bootstrap-fc6eeb6/seed/* . COPY --from=extract /lrvick-live-bootstrap-fc6eeb6/steps steps diff --git a/src/bootstrap/stage2/Containerfile b/src/bootstrap/stage2/Containerfile index 3bb5575..e14c408 100644 --- a/src/bootstrap/stage2/Containerfile +++ b/src/bootstrap/stage2/Containerfile @@ -61,7 +61,7 @@ ADD --checksum=sha256:${MPC_HASH} ${MPC_SITE} . ADD --checksum=sha256:${ISL_HASH} ${ISL_SITE} . FROM fetch as build -COPY --from=stagex/stage2 . / +COPY --from=stage2 . / RUN set -eux; \ tar -xf ${LINUX_FILE}; \ tar -xzf ${MUSL_FILE}; \ @@ -172,7 +172,7 @@ RUN set -eux; \ FROM build as install WORKDIR ${HOME} USER 0:0 -COPY --from=stagex/stage1 . /rootfs/ +COPY --from=stage1 . /rootfs/ RUN set -eux; \ rm /rootfs/lib; \ env -C build-musl make DESTDIR=/rootfs/${TARGET} install; \ diff --git a/src/bootstrap/stage3/Containerfile b/src/bootstrap/stage3/Containerfile index b0df328..8a50c15 100644 --- a/src/bootstrap/stage3/Containerfile +++ b/src/bootstrap/stage3/Containerfile @@ -71,7 +71,7 @@ ADD --checksum=sha256:${MPC_HASH} ${MPC_SITE} . ADD --checksum=sha256:${ISL_HASH} ${ISL_SITE} . FROM fetch as build -COPY --from=stagex/stage2 . / +COPY --from=stage2 . / RUN --network=none <<-EOF set -eux tar -xf ${LINUX_FILE}