From dc16ec8e919d978c4211c5080e6b8b188e965c84 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Sat, 23 Dec 2023 11:45:04 -0800 Subject: [PATCH] use explicit line endings instead of heredoc for podman compat --- src/bootstrap/live/Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bootstrap/live/Dockerfile b/src/bootstrap/live/Dockerfile index 7e8618c..67d06ea 100644 --- a/src/bootstrap/live/Dockerfile +++ b/src/bootstrap/live/Dockerfile @@ -23,20 +23,20 @@ RUN ./download-distfiles.sh RUN set -eux; \ mkdir -p /rootfs; \ mv steps distfiles seed/* /rootfs/ -RUN cat < /rootfs/steps/bootstrap.cfg -FORCE_TIMESTAMPS=False -CHROOT=False -CHROOT_ONLY_SYSA=False -UPDATE_CHECKSUMS=False -JOBS=2 -INTERNAL_CI=None -BARE_METAL=True -DISK=sdb -KERNEL_BOOTSTRAP=True -BUILD_KERNELS=False -EOF +RUN echo "\ +FORCE_TIMESTAMPS=False\n\ +CHROOT=False\n\ +CHROOT_ONLY_SYSA=False\n\ +UPDATE_CHECKSUMS=False\n\ +JOBS=2\n\ +INTERNAL_CI=None\n\ +BARE_METAL=True\n\ +DISK=sdb\n\ +KERNEL_BOOTSTRAP=True\n\ +BUILD_KERNELS=False\ +" > /rootfs/steps/bootstrap.cfg -FROM busybox as build +FROM scratch as build COPY --from=stage0 / . COPY --from=fetch /rootfs . ENV ARCH_DIR=x86