From 7a9774f0a0b3ee9354fa2e840451dab3c13ce006 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 22 Jul 2022 18:01:08 -0400 Subject: [PATCH 1/4] convert to s6v3 hybrid --- .../init-mod-apt-get/dependencies.d/init-mods | 0 .../s6-overlay/s6-rc.d/init-mod-apt-get/run | 5 ++ .../s6-overlay/s6-rc.d/init-mod-apt-get/type | 1 + .../s6-overlay/s6-rc.d/init-mod-apt-get/up | 1 + .../dependencies.d/init-mod-apt-get | 0 .../init-mod-universal-docker-in-docker/run | 54 +++++++++++++++++++ .../init-mod-universal-docker-in-docker/type | 1 + .../init-mod-universal-docker-in-docker/up | 1 + .../dependencies.d/init-mod-apt-get | 0 .../init-mod-universal-docker-in-docker | 0 .../dependencies.d/init-services | 0 .../log/run | 6 +++ .../svc-mod-universal-docker-in-docker/run | 27 ++++++++++ .../svc-mod-universal-docker-in-docker/type | 1 + .../s6-rc.d/user/contents.d/init-mod-apt-get | 0 .../init-mod-universal-docker-in-docker | 0 .../svc-mod-universal-docker-in-docker | 0 17 files changed, 97 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/dependencies.d/init-mod-apt-get create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-apt-get create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-in-docker create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/log/run create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-apt-get create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-in-docker create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-docker-in-docker 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-apt-get/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 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 new file mode 100755 index 0000000..8e5fe66 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/run @@ -0,0 +1,5 @@ +#!/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/type b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file 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 new file mode 100644 index 0000000..c601d45 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-apt-get/up @@ -0,0 +1 @@ +/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-universal-docker-in-docker/dependencies.d/init-mod-apt-get b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/dependencies.d/init-mod-apt-get new file mode 100644 index 0000000..e69de29 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/run new file mode 100755 index 0000000..e25712b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/run @@ -0,0 +1,54 @@ +#!/usr/bin/with-contenv bash + +ABC_USER=$(id -nu ${PUID:-911}) +mkdir -p /config/{logs/dockerd,var/lib/docker} +chown -R ${ABC_USER}:${ABC_USER} /config/logs + +echo "**** installing docker and docker compose ****" +if [ -f /usr/bin/apt ]; then + apt-get install -y \ + btrfs-progs \ + ca-certificates \ + curl \ + e2fsprogs \ + iptables \ + openssh-client \ + openssl \ + pigz \ + xfsprogs \ + xz-utils +else + apk add --no-cache \ + btrfs-progs \ + curl \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + pigz \ + xfsprogs \ + xz +fi +ARCH=$(uname -m) +if [ -d "/docker-tgz" ] ; then + echo "Copying over docker and docker-compose binaries" + mkdir -p /usr/local/lib/docker/cli-plugins + mv "/docker-tgz/docker-compose_${ARCH}" /usr/local/lib/docker/cli-plugins/docker-compose + mv "/docker-tgz/compose-switch_${ARCH}" /usr/local/bin/docker-compose + tar xf /docker-tgz/docker_${ARCH}.tgz \ + --strip-components=1 -C \ + /usr/local/bin/ + rm -rf /docker-tgz +else + echo "**** docker and docker-compose already installed, skipping ****" +fi + +# delete PID if exists +find /run /var/run -iname 'docker*.pid' -delete || : + +# create docker group and add abc to it +groupadd -f docker +if ! id -nG ${ABC_USER} | grep -q "docker"; then + usermod -aG docker ${ABC_USER} +fi 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/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/type @@ -0,0 +1 @@ +oneshot \ 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 new file mode 100644 index 0000000..0c37875 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker/up @@ -0,0 +1 @@ +/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-apt-get new file mode 100644 index 0000000..e69de29 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/init-mods-end/dependencies.d/init-mod-universal-docker-in-docker new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 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 new file mode 100755 index 0000000..87978ab --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/log/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash + +ABC_USER=$(id -nu ${PUID:-911}) + +exec \ + s6-setuidgid ${ABC_USER} s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/logs/dockerd diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run new file mode 100755 index 0000000..072d05d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run @@ -0,0 +1,27 @@ +#!/usr/bin/with-contenv bash + +## dind hack from https://github.com/moby/moby/blob/master/hack/dind +export container=docker +if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then + mount -t securityfs none /sys/kernel/security || { + echo 'Could not mount /sys/kernel/security.' + echo 'AppArmor detection and --privileged mode might break.' + } +fi +# Mount /tmp (conditionally) +if ! mountpoint -q /tmp; then + mount -t tmpfs none /tmp +fi +# cgroup v2: enable nesting +if [ -f /sys/fs/cgroup/cgroup.controllers ]; then + # move the init process (PID 1) from the root group to the /init group, + # otherwise writing subtree_control fails with EBUSY. + mkdir -p /sys/fs/cgroup/init + echo 1 > /sys/fs/cgroup/init/cgroup.procs + # enable controllers + sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \ + > /sys/fs/cgroup/cgroup.subtree_control +fi + +exec 2>&1 /usr/local/bin/dockerd \ + --data-root "/config/var/lib/docker" diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/type @@ -0,0 +1 @@ +longrun \ No newline at end of file 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-apt-get new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-docker-in-docker b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-docker-in-docker new file mode 100644 index 0000000..e69de29 From b0fd5bbe94ff120a9f7b1f3cd0481e78049eeb41 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 22 Jul 2022 21:05:58 -0400 Subject: [PATCH 2/4] fix dockerd s6-log --- .../s6-rc.d/svc-mod-universal-docker-in-docker-log/consumer-for | 1 + .../dependencies.d/init-services | 0 .../s6-rc.d/svc-mod-universal-docker-in-docker-log/pipeline-name | 1 + .../log => svc-mod-universal-docker-in-docker-log}/run | 0 .../s6-rc.d/svc-mod-universal-docker-in-docker-log/type | 1 + .../s6-rc.d/svc-mod-universal-docker-in-docker/producer-for | 1 + .../user/contents.d/mod-universal-docker-in-docker-pipeline | 0 7 files changed, 4 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/consumer-for create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/pipeline-name rename root/etc/s6-overlay/s6-rc.d/{svc-mod-universal-docker-in-docker/log => svc-mod-universal-docker-in-docker-log}/run (100%) mode change 100755 => 100644 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/type create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/producer-for create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-universal-docker-in-docker-pipeline diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/consumer-for b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/consumer-for new file mode 100644 index 0000000..d9430bd --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/consumer-for @@ -0,0 +1 @@ +svc-mod-universal-docker-in-docker \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/pipeline-name b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/pipeline-name new file mode 100644 index 0000000..d80cdad --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/pipeline-name @@ -0,0 +1 @@ +mod-universal-docker-in-docker-pipeline \ No newline at end of file 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 100755 new mode 100644 similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/log/run rename to root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker-log/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/producer-for b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/producer-for new file mode 100644 index 0000000..a80969e --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/producer-for @@ -0,0 +1 @@ +svc-mod-universal-docker-in-docker-log \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-universal-docker-in-docker-pipeline b/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-universal-docker-in-docker-pipeline new file mode 100644 index 0000000..e69de29 From 2a6bc0aeffa212bc2f1ef8cc9325c3c0e6b2dbef Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 28 Jul 2022 09:41:33 -0400 Subject: [PATCH 3/4] 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 From fafe7ee709a7687771d9c53147312b59a9267e8f Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 29 Jul 2022 15:11:59 -0400 Subject: [PATCH 4/4] 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 ...mod-universal-docker-in-docker-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-universal-docker-in-docker-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-universal-docker-in-docker-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-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-package-install/dependencies.d/init-mod-universal-docker-in-docker-add-package rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-universal-docker-in-docker-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