Optimise and fix s6

base-fullbuild/Dockerfile

@@ -29,6 +29,7 @@ ENV LANG='en_US.UTF-8'                   \
     S6_LOGGING="1"                       \
     S6_VERBOSITY="0"                     \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
+    S6_STAGE2_HOOK="/container-init"     \
     TZ="Europe/London"
 
 RUN <<EOF
@@ -74,7 +75,8 @@ RUN --mount=type=cache,id=pip,target=/root/.cache,sharing=locked \
     borgmatic --bash-completion > "$(pkg-config --variable=completionsdir bash-completion)"/borgmatic
 EOF
 
-COPY --chmod=744 --link root/ /
+COPY --link root/ /
+COPY --chmod=744 --link /scripts/container-init /container-init
 
 VOLUME /root/.borgmatic
 VOLUME /root/.config/borg

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-config-end/type

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

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-config-end/up

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

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-custom-packages/run

@@ -1,14 +1,17 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 # Install DockerCLI if true
 if [ "${DOCKERCLI}" == "true" ]; then
-  echo "[custom-init] Installing Docker CLI and Compose..."
+  echo "[custom-init] Installing Docker CLI and Docker Compose..."
   apk add -U --quiet docker-cli docker-cli-compose
+else
+  echo "[custom-init] Docker CLI variable not set, skipping..."
 fi
 
 # Install additional packages
-if [ -v EXTRA_PKGS ]
-then
-    echo "[custom-init] Installing extra packages: $EXTRA_PKGS"
-    apk add -U --quiet $EXTRA_PKGS
+if [ -v EXTRA_PKGS ]; then
+  echo "[custom-init] Installing extra packages: $EXTRA_PKGS"
+  apk add -U --quiet $EXTRA_PKGS
+else
+  echo "[custom-init] No custom packages found, skipping..."
 fi

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-custom-scripts/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 # Directories
 SCRIPTS_DIR="/custom-cont-init.d"

base-fullbuild/root/etc/s6-overlay/s6-rc.d/svc-cron/finish

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/command/with-contenv bash
 
 if test "$1" -eq 256 ; then
   e=$((128 + $2))
@@ -7,4 +7,4 @@ else
 fi
 
 echo "Received exit code $e."
-echo "$e" > /run/s6-linux-init-container-results/exitcode
+echo "$e" > /run/s6-linux-init-container-results/exitcode

base-fullbuild/root/etc/s6-overlay/s6-rc.d/svc-cron/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 # Version variables
 borgver=$(borg --version)
@@ -15,6 +15,7 @@ else
 fi
 
 # Software versions
+echo "-----------------------------------"
 echo "Software Versions:
 -----------------------------------
 apprise $apprisever

base-fullbuild/scripts/container-init

@@ -0,0 +1,57 @@
+#!/command/with-contenv bash
+
+# Borrowed heavily from https://github.com/linuxserver/docker-mods/tree/mod-scripts
+
+echo "[init] Initialising Container..."
+
+# Define custom folder paths
+SCRIPTS_DIR="/custom-cont-init.d"
+SERVICES_DIR="/custom-services.d"
+
+# Set executable bit on cont-init and services built into the image
+set_legacy_executable_bits() {
+    mkdir -p /etc/{cont-init.d,services.d}
+    chmod +x \
+        /etc/cont-init.d/* \
+        /etc/services.d/*/* 2>/dev/null || true
+}
+
+# https://www.linuxserver.io/blog/2019-09-14-customizing-our-containers#custom-services
+process_custom_services() {
+    # Remove all existing custom services before continuing to ensure
+    # we aren't running anything the user may have removed
+    if [[ -n "$(/bin/ls -A /etc/s6-overlay/s6-rc.d/custom-svc-* 2>/dev/null)" ]]; then
+        echo "[custom-init] removing existing custom services..."
+        rm -rf /etc/s6-overlay/s6-rc.d/custom-svc-*
+        rm /etc/s6-overlay/s6-rc.d/user/contents.d/custom-svc-*
+    fi
+
+    # Make sure custom service directory exists and has files in it
+    if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]]; then
+        echo "[custom-init] Service files found in ${SERVICES_DIR}"
+        for SERVICE in "${SERVICES_DIR}"/*; do
+            NAME="$(basename "${SERVICE}")"
+            if [[ -f "${SERVICE}" ]]; then
+                echo "[custom-init] ${NAME}: service detected, copying..."
+                mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/
+                cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
+                chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run
+                echo "longrun" >/etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type
+                touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services
+                touch /etc/s6-overlay/s6-rc.d/user/contents.d/custom-svc-"${NAME}"
+                echo "[custom-init] ${NAME}: copied"
+            elif [[ ! -f "${SERVICE}" ]]; then
+                echo "[custom-init] ${NAME}: is not a file"
+            fi
+        done
+    else
+        echo "[custom-init] No custom services found, skipping..."
+    fi
+}
+
+if [[ -d "${SCRIPTS_DIR}" ]] || [[ -d "${SERVICES_DIR}" ]]; then
+    process_custom_services
+fi
+
+# Set executable bit on legacy cont-init and services built into the image and anything legacy unpacked by mods
+set_legacy_executable_bits