Merge branch 'linuxserver:jammy' into jammy

package_versions.txt

@@ -1,6 +1,6 @@
 adduser3.118ubuntu5
-apt2.4.5
-apt-utils2.4.5
+apt2.4.6
+apt-utils2.4.6
 base-files12ubuntu4.1
 base-passwd3.5.52build1
 bash5.1-6ubuntu1
@@ -32,7 +32,7 @@ gzip1.10-4ubuntu4
 hostname3.23ubuntu2
 init-system-helpers1.62
 libacl12.3.1-1
-libapt-pkg6.02.4.5
+libapt-pkg6.02.4.6
 libassuan02.5.5-1build1
 libattr11:2.5.1-1build1
 libaudit11:3.0.7-1build1
@@ -110,7 +110,7 @@ libunistring21.0-1
 libuuid12.37.2-4ubuntu3
 libxxhash00.8.1-1
 libzstd11.4.8+dfsg-3build1
-locales2.35-0ubuntu3
+locales2.35-0ubuntu3.1
 login1:4.8.1-2ubuntu2
 logsave1.46.5-2ubuntu1.1
 lsb-base11.1.0ubuntu4

root/docker-mods

@@ -123,9 +123,23 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
       --header "Authorization: Bearer ${TOKEN}" \
       "${BLOB_URL}${SHALAYER}" -o \
       /modtarball.tar.xz
-    tar xzf /modtarball.tar.xz -C /
+    mkdir -p /tmp/mod
+    tar xzf /modtarball.tar.xz -C /tmp/mod
+    if [ -d /tmp/mod/etc/s6-overlay ]; then
+      if [ -d /tmp/mod/etc/cont-init.d ]; then
+        rm -rf /tmp/mod/etc/cont-init.d
+      fi
+      if [ -d /tmp/mod/etc/services.d ]; then
+        rm -rf /tmp/mod/etc/services.d
+      fi
+    fi
+    shopt -s dotglob
+    cp -R /tmp/mod/* /
+    shopt -u dotglob
+    rm -rf /tmp/mod
     rm -rf /modtarball.tar.xz
     echo ${SHALAYER} > "/${FILENAME}"
+    echo "[mod-init] ${DOCKER_MOD} applied to container"
   fi
 done
 

root/etc/s6-overlay/s6-rc.d/init-mods-end/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mods-end/up

@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the end of the mod init process

root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run

@@ -0,0 +1,35 @@
+#!/usr/bin/with-contenv bash
+
+if [ -f "/mod-repo-packages-to-install.list" ]; then
+    echo "**** Installing all mod packages ****"
+    if [ -f /usr/bin/apt ]; then
+        export DEBIAN_FRONTEND="noninteractive"
+        apt-get update
+        apt-get install -y --no-install-recommends \
+            $(cat /mod-repo-packages-to-install.list)
+    elif [ -f /sbin/apk ]; then
+        apk add --no-cache \
+            $(cat /mod-repo-packages-to-install.list)
+    fi
+fi
+
+if [ -f "/mod-pip-packages-to-install.list" ]; then
+    echo "**** Installing all pip packages ****"
+    python3 -m pip install -U pip wheel setuptools
+    if [ -f /usr/bin/apt ]; then
+        PIP_ARGS="-f https://wheel-index.linuxserver.io/ubuntu/"
+    elif [ -f /sbin/apk ]; then
+        ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||')
+        if [ "${ALPINE_VER}" = "3.14" ]; then
+            PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine/"
+        else
+            PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine-${ALPINE_VER}/"
+        fi
+    fi
+    python3 -m pip install ${PIP_ARGS} \
+        $(cat /mod-pip-packages-to-install.list)
+fi
+
+rm -rf \
+    /mod-repo-packages-to-install.list \
+    /mod-pip-packages-to-install.list

root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mods-package-install/run

root/etc/s6-overlay/s6-rc.d/init-mods/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mods/up

@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the start of the mod init process

root/etc/s6-overlay/s6-rc.d/init-services/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-services/up

@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the start of the service init process