From ff6532acc1141e712897a697b5057f1571930d8e Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 15 Nov 2024 11:46:23 +0000 Subject: [PATCH 1/4] Tidy up init deps --- .../dependencies.d/init-crontab-config} | 0 .../init-mods => init-crontab-config/dependencies.d/init-config} | 0 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base | 0 .../s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/{init-crontab-config/dependencies.d/init-os-end => init-config-end/dependencies.d/init-crontab-config} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-end/dependencies.d/init-mods => init-crontab-config/dependencies.d/init-config} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-os-end rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations deleted file mode 100644 index e69de29..0000000 From a85f01ac962a3f6b7f842a42b6871149e4336bb1 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 15 Nov 2024 11:50:23 +0000 Subject: [PATCH 2/4] Bump s6, add with-contenv from repo --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f7c07ca..fadfdef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.6.2" +ARG S6_OVERLAY_VERSION="3.2.0.2" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay @@ -59,6 +59,7 @@ LABEL maintainer="TheLamer" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" +ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c64265c..59491c7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.6.2" +ARG S6_OVERLAY_VERSION="3.2.0.2" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay @@ -59,6 +59,7 @@ LABEL maintainer="TheLamer" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" +ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ From cfdd9eb4b6e13d7148efcb27207f2a2595b7077b Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 15 Nov 2024 11:56:16 +0000 Subject: [PATCH 3/4] Add missing ARG --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index fadfdef..019a768 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,7 @@ ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" ARG LSIOWN_VERSION="v1" +ARG WITHCONTENV_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 59491c7..64e5cf2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -53,6 +53,7 @@ ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" ARG LSIOWN_VERSION="v1" +ARG WITHCONTENV_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" From b3e506e3377159e7a00722a182d9ed49093c247c Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 15 Nov 2024 12:15:47 +0000 Subject: [PATCH 4/4] Remove contenv symlink so we don't overwrite it --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 019a768..c9452f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz # add s6 optional symlinks ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz +RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /root-out/usr/bin/with-contenv ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 64e5cf2..2c23d66 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,7 +41,7 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz # add s6 optional symlinks ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz +RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /root-out/usr/bin/with-contenv ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz