From 2a6bc0aeffa212bc2f1ef8cc9325c3c0e6b2dbef Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 28 Jul 2022 09:41:33 -0400 Subject: [PATCH] switch to package install --- .../s6-overlay/s6-rc.d/init-mod-apt-get/run | 5 --- .../s6-overlay/s6-rc.d/init-mod-apt-get/up | 1 - ...od-universal-docker-in-docker-add-package} | 0 .../s6-rc.d/init-mod-package-install/run | 37 +++++++++++++++++++ .../type | 0 .../s6-rc.d/init-mod-package-install/up | 1 + .../dependencies.d/init-mods} | 0 .../run | 10 +++-- .../type | 0 .../up | 1 + .../init-mod-universal-docker-in-docker/up | 1 - ...t-mod-apt-get => init-mod-package-install} | 0 .../run | 0 .../contents.d/init-mod-package-install} | 0 .../init-mod-universal-docker-in-docker | 0 ...od-universal-docker-in-docker-add-package} | 0 16 files changed, 45 insertions(+), 11 deletions(-) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up rename root/etc/s6-overlay/s6-rc.d/{init-mod-apt-get/dependencies.d/init-mods => init-mod-package-install/dependencies.d/init-mod-universal-docker-in-docker-add-package} (100%) create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-package-install/run rename root/etc/s6-overlay/s6-rc.d/{init-mod-apt-get => init-mod-package-install}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up rename root/etc/s6-overlay/s6-rc.d/{init-mod-universal-docker-in-docker/dependencies.d/init-mod-apt-get => init-mod-universal-docker-in-docker-add-package/dependencies.d/init-mods} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-universal-docker-in-docker => init-mod-universal-docker-in-docker-add-package}/run (82%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-universal-docker-in-docker => init-mod-universal-docker-in-docker-add-package}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up rename root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/{init-mod-apt-get => init-mod-package-install} (100%) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/run rename root/etc/s6-overlay/s6-rc.d/{init-mods-end/dependencies.d/init-mod-universal-docker-in-docker => user/contents.d/init-mod-package-install} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{init-mod-apt-get => init-mod-universal-docker-in-docker-add-package} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run deleted file mode 100755 index 8e5fe66..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ -f /usr/bin/apt ]; then - apt-get update -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up deleted file mode 100644 index c601d45..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/dependencies.d/init-mod-universal-docker-in-docker-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mod-package-install/dependencies.d/init-mod-universal-docker-in-docker-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/run new file mode 100755 index 0000000..7fdb63f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-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 + 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=$(cat /etc/apk/repositories | grep main | 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-mod-apt-get/type b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-package-install/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up new file mode 100644 index 0000000..45ff785 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-package-install/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/dependencies.d/init-mod-apt-get b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/dependencies.d/init-mod-apt-get rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run similarity index 82% rename from root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run index e25712b..ed9e19a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run @@ -6,7 +6,8 @@ chown -R ${ABC_USER}:${ABC_USER} /config/logs echo "**** installing docker and docker compose ****" if [ -f /usr/bin/apt ]; then - apt-get install -y \ + echo "**** Adding docker-in-docker dependency packages to install list ****" + echo "\ btrfs-progs \ ca-certificates \ curl \ @@ -16,9 +17,10 @@ if [ -f /usr/bin/apt ]; then openssl \ pigz \ xfsprogs \ - xz-utils + xz-utils" >> /mod-repo-packages-to-install.list else - apk add --no-cache \ + echo "**** Adding docker-in-docker dependency packages to install list ****" + echo "\ btrfs-progs \ curl \ e2fsprogs \ @@ -28,7 +30,7 @@ else openssl \ pigz \ xfsprogs \ - xz + xz" >> /mod-repo-packages-to-install.list fi ARCH=$(uname -m) if [ -d "/docker-tgz" ] ; then diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/type b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/up new file mode 100644 index 0000000..4dc82dd --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up deleted file mode 100644 index 0c37875..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-apt-get b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-package-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-apt-get rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-package-install diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/run old mode 100644 new mode 100755 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-in-docker b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-package-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-in-docker rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-package-install diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-apt-get b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-apt-get rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker-add-package