diff --git a/Dockerfile b/Dockerfile index 063595d..7e3ca93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_VERSION="3.1.2.0" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay @@ -54,10 +54,6 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz # copy ci-checks COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / @@ -70,7 +66,9 @@ LABEL maintainer="TheLamer" ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 03c98fd..816e517 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_VERSION="3.2.0.0" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay @@ -54,10 +54,6 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz # copy ci-checks COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / @@ -70,7 +66,9 @@ LABEL maintainer="TheLamer" ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e46f1f3..ee52624 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_VERSION="3.1.2.0" ARG S6_OVERLAY_ARCH="armhf" # add s6 overlay @@ -54,10 +54,6 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz # copy ci-checks COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / @@ -70,7 +66,9 @@ LABEL maintainer="TheLamer" ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods RUN \ echo "**** install runtime packages ****" && \ diff --git a/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch b/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch deleted file mode 100644 index b01a7f0..0000000 --- a/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rc.init 2022-05-20 17:41:11.195721000 -0500 -+++ rc.init.patched 2022-05-20 17:41:37.646586700 -0500 -@@ -6,6 +6,8 @@ - s6-chmod 0755 /run/s6/container_environment - fi - -+/docker-mods -+ - if profile=`printcontenv S6_RUNTIME_PROFILE` ; then - etc="/etc/cont-profile.d/$profile" - else