diff --git a/.dockerignore b/.dockerignore index 697adc052..4c029068b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,5 @@ target # These directories don't contribute to our container build docs/ plans/ +Containerfile +build_seed.sh diff --git a/Containerfile b/Containerfile new file mode 100644 index 000000000..ef75123a5 --- /dev/null +++ b/Containerfile @@ -0,0 +1,25 @@ +FROM quay.io/centos/centos:stream9 as build +COPY hack/build.sh /build.sh +RUN /build.sh && rm -v /build.sh +COPY . /build +WORKDIR /build +RUN mkdir -p /build/target/dev-rootfs # This can hold arbitrary extra content +# See https://www.reddit.com/r/rust/comments/126xeyx/exploring_the_problem_of_faster_cargo_docker/ +# We aren't using the full recommendations there, just the simple bits. +RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar /out +RUN mkdir -p /build/target/dev-rootfs # This can hold arbitrary extra content + +FROM quay.io/otuchfel/ostbackup:serv1 as seed + +# ____________________________________________________________________________ + +FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b1124faf4b73753b4679085604dd8cb810c4a7a2e659978f5c80183bb165f94 + +LABEL com.openshift.lifecycle-agent.seed_format_version=3 + +RUN mkdir -p /usr/lib/bootc/install + +COPY --from=seed --exclude=ostree.tgz / /var/tmp/seed + +COPY --from=build /out/bootc.tar /tmp +RUN tar -C / -xvf /tmp/bootc.tar && rm -vrf /tmp/* diff --git a/Makefile b/Makefile index 3809c4b93..813c09edd 100644 --- a/Makefile +++ b/Makefile @@ -50,10 +50,10 @@ install-all: install install-ostree-hooks install -D -m 0755 target/release/tests-integration $(DESTDIR)$(prefix)/bin/bootc-integration-tests bin-archive: all - $(MAKE) install DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf + $(MAKE) install DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) -C tmp-install -cf target/bootc.tar . && rm tmp-install -rf test-bin-archive: all - $(MAKE) install-all DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf + $(MAKE) install-all DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) -C tmp-install -cf target/bootc.tar . && rm tmp-install -rf test-tmt: cargo xtask test-tmt diff --git a/build_seed.sh b/build_seed.sh new file mode 100755 index 000000000..4f113a9f4 --- /dev/null +++ b/build_seed.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +SCRIPT_DIR=$(dirname $0) + +cd $SCRIPT_DIR + +podman build -t bootcseed -f Containerfile . +podman tag bootcseed:latest quay.io/otuchfel/bootc:seed +podman push quay.io/otuchfel/bootc:seed diff --git a/hack/Containerfile b/hack/Containerfile index 50f88ff90..d7453a6f2 100644 --- a/hack/Containerfile +++ b/hack/Containerfile @@ -14,7 +14,7 @@ WORKDIR /build RUN mkdir -p /build/target/dev-rootfs # This can hold arbitrary extra content # See https://www.reddit.com/r/rust/comments/126xeyx/exploring_the_problem_of_faster_cargo_docker/ # We aren't using the full recommendations there, just the simple bits. -RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar.zst /out +RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar /out FROM $base # We support e.g. adding cloud-init @@ -26,8 +26,8 @@ COPY hack/install-test-configs/* /usr/lib/bootc/install/ # And some test kargs COPY hack/test-kargs /usr/lib/bootc/kargs.d/ # Inject our built code -COPY --from=build /out/bootc.tar.zst /tmp -RUN tar -C / --zstd -xvf /tmp/bootc.tar.zst && rm -vrf /tmp/* +COPY --from=build /out/bootc.tar /tmp +RUN tar -C / -xvf /tmp/bootc.tar && rm -vrf /tmp/* # Also copy over arbitrary bits from the target root COPY --from=build /build/target/dev-rootfs/ / # Test our own linting diff --git a/lib/src/install.rs b/lib/src/install.rs index 475f65d60..185ec251a 100644 --- a/lib/src/install.rs +++ b/lib/src/install.rs @@ -1054,8 +1054,8 @@ fn ensure_var() -> Result<()> { /// will traverse the link. #[context("Linking tmp mounts to host")] pub(crate) fn setup_tmp_mounts() -> Result<()> { - let st = rustix::fs::statfs("/tmp")?; - if st.f_type == libc::TMPFS_MAGIC { + let slash_tmp_statfs = rustix::fs::statfs("/tmp")?; + if slash_tmp_statfs.f_type == libc::TMPFS_MAGIC { tracing::trace!("Already have tmpfs /tmp") } else { // Note we explicitly also don't want a "nosuid" tmp, because that