From 1b550ca3f9877f720bb29cb86eebc15bf0a3dd2b Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 29 Jul 2022 15:50:47 +0100 Subject: [PATCH 1/4] Universal mod package install --- .../dependencies.d/init-mods-package-install | 0 .../dependencies.d/init-mods | 0 .../s6-rc.d/init-mods-package-install/run | 37 +++++++++++++++++++ .../s6-rc.d/init-mods-package-install/type | 1 + .../s6-rc.d/init-mods-package-install/up | 1 + .../user/contents.d/init-mods-package-install | 0 6 files changed, 39 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run new file mode 100755 index 0000000..4f6df75 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run @@ -0,0 +1,37 @@ +#!/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 \ + $(cat /mod-repo-packages-to-install.list) + elif [ -f /usr/bin/apk ]; then + apk add --no-cache \ + $(cat /mod-repo-packages-to-install.list) + fi +else + echo "**** No repo packages to install, skipping ****" +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 /usr/bin/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 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up new file mode 100644 index 0000000..fb63301 --- /dev/null +++ b/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 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install new file mode 100644 index 0000000..e69de29 From 590130ad994bba777eceaf0dedcbaa778fdf1c7e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 29 Jul 2022 16:08:05 +0100 Subject: [PATCH 2/4] Only install required deps --- root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run index 4f6df75..8f23925 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run @@ -5,7 +5,7 @@ if [ -f "/mod-repo-packages-to-install.list" ]; then if [ -f /usr/bin/apt ]; then export DEBIAN_FRONTEND="noninteractive" apt-get update - apt-get install -y \ + apt-get install -y --no-install-recommends \ $(cat /mod-repo-packages-to-install.list) elif [ -f /usr/bin/apk ]; then apk add --no-cache \ From e76811827f6cc42beb927f39b53d6d8c5701cfe6 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 29 Jul 2022 17:23:40 +0100 Subject: [PATCH 3/4] Fix apk path --- root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run index 8f23925..2083832 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run @@ -7,7 +7,7 @@ if [ -f "/mod-repo-packages-to-install.list" ]; then apt-get update apt-get install -y --no-install-recommends \ $(cat /mod-repo-packages-to-install.list) - elif [ -f /usr/bin/apk ]; then + elif [ -f /sbin/apk ]; then apk add --no-cache \ $(cat /mod-repo-packages-to-install.list) fi @@ -20,7 +20,7 @@ if [ -f "/mod-pip-packages-to-install.list" ]; then 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 /usr/bin/apk ]; then + 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/" From 49dd15767ae51786a1769a4c6a56c1632d41f7ef Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 29 Jul 2022 17:26:02 +0100 Subject: [PATCH 4/4] Remove "nothing to do" echo --- root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run | 2 -- 1 file changed, 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run index 2083832..fb5b11d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run @@ -11,8 +11,6 @@ if [ -f "/mod-repo-packages-to-install.list" ]; then apk add --no-cache \ $(cat /mod-repo-packages-to-install.list) fi -else - echo "**** No repo packages to install, skipping ****" fi if [ -f "/mod-pip-packages-to-install.list" ]; then