From aafd9e06ac04c3d62c7eaeaeeac804339b84eacb Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 29 Jul 2022 15:04:00 -0400 Subject: [PATCH] remove package install as it's now in the base --- .../s6-rc.d/init-mod-package-install/run | 37 ------------------- .../s6-rc.d/init-mod-package-install/type | 1 - .../s6-rc.d/init-mod-package-install/up | 1 - .../dependencies.d/init-mod-package-install | 0 .../init-mod-awscli-add-package | 0 .../user/contents.d/init-mod-package-install | 0 6 files changed, 39 deletions(-) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-package-install/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-package-install/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-package-install rename root/etc/s6-overlay/s6-rc.d/{init-mod-package-install => init-mods-package-install}/dependencies.d/init-mod-awscli-add-package (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-package-install 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 deleted file mode 100755 index 7fdb63f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/run +++ /dev/null @@ -1,37 +0,0 @@ -#!/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-package-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file 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 deleted file mode 100644 index 45ff785..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/up +++ /dev/null @@ -1 +0,0 @@ -/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-mods-end/dependencies.d/init-mod-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-package-install deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-package-install/dependencies.d/init-mod-awscli-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-awscli-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-package-install/dependencies.d/init-mod-awscli-add-package rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-awscli-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-package-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-package-install deleted file mode 100644 index e69de29..0000000