Merge pull request #140 from linuxserver/jammy-s6bump

Dockerfile

@@ -27,7 +27,7 @@ RUN \
     /root-out/var/log/*
 
 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.2.1"
+ARG S6_OVERLAY_VERSION="3.1.5.0"
 ARG S6_OVERLAY_ARCH="x86_64"
 
 # add s6 overlay
@@ -48,10 +48,12 @@ COPY --from=rootfs-stage /root-out/ /
 ARG BUILD_DATE
 ARG VERSION
 ARG MODS_VERSION="v3"
+ARG PKG_INST_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"
 
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
+ADD --chmod=744 "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"
 
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -61,7 +63,9 @@ LANG="en_US.UTF-8" \
   TERM="xterm" \
   S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
   S6_VERBOSITY=1 \
-S6_STAGE2_HOOK=/docker-mods
+  S6_STAGE2_HOOK=/docker-mods \
+  VIRTUAL_ENV=/lsiopy \
+  PATH="/lsiopy/bin:$PATH"
 
 # copy sources
 COPY sources.list /etc/apt/
@@ -119,7 +123,8 @@ RUN \
   mkdir -p \
     /app \
     /config \
-    /defaults && \
+    /defaults \
+    /lsiopy && \
   echo "**** cleanup ****" && \
   apt-get autoremove && \
   apt-get clean && \

Dockerfile.aarch64

@@ -27,7 +27,7 @@ RUN \
     /root-out/var/log/*
 
 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.2.1"
+ARG S6_OVERLAY_VERSION="3.1.5.0"
 ARG S6_OVERLAY_ARCH="aarch64"
 
 # add s6 overlay
@@ -48,10 +48,12 @@ COPY --from=rootfs-stage /root-out/ /
 ARG BUILD_DATE
 ARG VERSION
 ARG MODS_VERSION="v3"
+ARG PKG_INST_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"
 
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
+ADD --chmod=744 "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"
 
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -61,7 +63,9 @@ LANG="en_US.UTF-8" \
   TERM="xterm" \
   S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
   S6_VERBOSITY=1 \
-S6_STAGE2_HOOK=/docker-mods
+  S6_STAGE2_HOOK=/docker-mods \
+  VIRTUAL_ENV=/lsiopy \
+  PATH="/lsiopy/bin:$PATH"
 
 # copy sources
 COPY sources.list.arm /etc/apt/sources.list
@@ -119,7 +123,8 @@ RUN \
   mkdir -p \
     /app \
     /config \
-    /defaults && \
+    /defaults \
+    /lsiopy && \
   echo "**** add qemu ****" && \
   curl -o \
   /usr/bin/qemu-aarch64-static -L \

Dockerfile.armhf

@@ -27,7 +27,7 @@ RUN \
     /root-out/var/log/*
 
 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.2.1"
+ARG S6_OVERLAY_VERSION="3.1.5.0"
 ARG S6_OVERLAY_ARCH="armhf"
 
 # add s6 overlay
@@ -48,10 +48,12 @@ COPY --from=rootfs-stage /root-out/ /
 ARG BUILD_DATE
 ARG VERSION
 ARG MODS_VERSION="v3"
+ARG PKG_INST_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"
 
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
+ADD --chmod=744 "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"
 
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -61,7 +63,9 @@ LANG="en_US.UTF-8" \
   TERM="xterm" \
   S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
   S6_VERBOSITY=1 \
-S6_STAGE2_HOOK=/docker-mods
+  S6_STAGE2_HOOK=/docker-mods \
+  VIRTUAL_ENV=/lsiopy \
+  PATH="/lsiopy/bin:$PATH"
 
 # copy sources
 COPY sources.list.arm /etc/apt/sources.list
@@ -119,7 +123,8 @@ RUN \
   mkdir -p \
     /app \
     /config \
-    /defaults && \
+    /defaults \
+    /lsiopy && \
   echo "**** add qemu ****" && \
   curl -o \
   /usr/bin/qemu-arm-static -L \

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

@@ -1,44 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-if [[ -f "/mod-repo-packages-to-install.list" ]]; then
-    IFS=' ' read -ra REPO_PACKAGES <<< "$(tr '\n' ' ' < /mod-repo-packages-to-install.list)"
-    if [[ ${#REPO_PACKAGES[@]} -ne 0 ]] && [[ ${REPO_PACKAGES[*]} != "" ]]; then
-        echo "[mod-init] **** Installing all mod packages ****"
-        if [[ -f /usr/bin/apt ]]; then
-            export DEBIAN_FRONTEND="noninteractive"
-            apt-get update
-            apt-get install -y --no-install-recommends \
-                "${REPO_PACKAGES[@]}"
-        elif [[ -f /sbin/apk ]]; then
-            apk add --no-cache \
-                "${REPO_PACKAGES[@]}"
-        fi
-    fi
-fi
-
-if [[ -f "/mod-pip-packages-to-install.list" ]]; then
-    IFS=' ' read -ra PIP_PACKAGES <<< "$(tr '\n' ' ' < /mod-pip-packages-to-install.list)"
-    if [[ ${#PIP_PACKAGES[@]} -ne 0 ]] && [[ ${PIP_PACKAGES[*]} != "" ]]; then
-        echo "[mod-init] **** Installing all pip packages ****"
-        python3 -m pip install -U pip wheel setuptools
-        PIP_ARGS=()
-        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[@]}" \
-            "${PIP_PACKAGES[@]}"
-    fi
-fi
-
-rm -rf \
-    /mod-repo-packages-to-install.list \
-    /mod-pip-packages-to-install.list