meatbag/baseimage-alpine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bump s6 to 3.1.2.0, replace patch with STAGE2_HOOK, reduce logging level

Browse source
This commit is contained in:
TheSpad 2022-08-28 12:57:13 +01:00
parent 7519dd8f97
commit ec2e9b7ac0
No known key found for this signature in database
GPG key ID: 08F06191F4587860
4 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -36,7 +36,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # 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" ARG S6_OVERLAY_ARCH="x86_64"
# add s6 overlay # 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-checks
COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d 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 # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
@ -70,7 +66,9 @@ LABEL maintainer="TheLamer"
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
TERM="xterm" \ 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 \ RUN \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \

10
Dockerfile.aarch64
View file

@ -36,7 +36,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # 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" ARG S6_OVERLAY_ARCH="aarch64"
# add s6 overlay # 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-checks
COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d 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 # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
@ -70,7 +66,9 @@ LABEL maintainer="TheLamer"
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
TERM="xterm" \ 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 \ RUN \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \

10
Dockerfile.armhf
View file

@ -36,7 +36,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # 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" ARG S6_OVERLAY_ARCH="armhf"
# add s6 overlay # 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-checks
COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d 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 # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
@ -70,7 +66,9 @@ LABEL maintainer="TheLamer"
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
TERM="xterm" \ 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 \ RUN \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \

11
patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch
View file

@ -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