From 7bf80db9f3952b6e4d1540785fa17664568afaaa Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 26 Feb 2023 16:23:34 +0000 Subject: [PATCH 1/7] Remove legacy /run symlink hack --- root/etc/s6-overlay/s6-rc.d/00-legacy/type | 1 - root/etc/s6-overlay/s6-rc.d/00-legacy/up | 1 - .../etc/s6-overlay/s6-rc.d/init-envfile/dependencies.d/00-legacy | 0 .../s6-overlay/s6-rc.d/init-migrations/dependencies.d/00-legacy | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy | 0 5 files changed, 2 deletions(-) delete mode 100644 root/etc/s6-overlay/s6-rc.d/00-legacy/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/00-legacy/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-envfile/dependencies.d/00-legacy delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-migrations/dependencies.d/00-legacy delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy diff --git a/root/etc/s6-overlay/s6-rc.d/00-legacy/type b/root/etc/s6-overlay/s6-rc.d/00-legacy/type deleted file mode 100644 index bdd22a1..0000000 --- a/root/etc/s6-overlay/s6-rc.d/00-legacy/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/00-legacy/up b/root/etc/s6-overlay/s6-rc.d/00-legacy/up deleted file mode 100644 index 4aa1c27..0000000 --- a/root/etc/s6-overlay/s6-rc.d/00-legacy/up +++ /dev/null @@ -1 +0,0 @@ -ln -s /run/s6/legacy-services /run/s6/services diff --git a/root/etc/s6-overlay/s6-rc.d/init-envfile/dependencies.d/00-legacy b/root/etc/s6-overlay/s6-rc.d/init-envfile/dependencies.d/00-legacy deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-migrations/dependencies.d/00-legacy b/root/etc/s6-overlay/s6-rc.d/init-migrations/dependencies.d/00-legacy deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy b/root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy deleted file mode 100644 index e69de29..0000000 From cff454b765e377c2a8e696f65ea2b6e7e7d00fee Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 26 Feb 2023 16:23:47 +0000 Subject: [PATCH 2/7] Rename CI check --- .../dependencies.d/legacy-services | 0 .../s6-rc.d/{99-ci-service-check => ci-service-check}/type | 0 .../s6-rc.d/{99-ci-service-check => ci-service-check}/up | 0 .../user2/contents.d/{99-ci-service-check => ci-service-check} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/{99-ci-service-check => ci-service-check}/dependencies.d/legacy-services (100%) rename root/etc/s6-overlay/s6-rc.d/{99-ci-service-check => ci-service-check}/type (100%) rename root/etc/s6-overlay/s6-rc.d/{99-ci-service-check => ci-service-check}/up (100%) rename root/etc/s6-overlay/s6-rc.d/user2/contents.d/{99-ci-service-check => ci-service-check} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services b/root/etc/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/dependencies.d/legacy-services diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type b/root/etc/s6-overlay/s6-rc.d/ci-service-check/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/type diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/ci-service-check/up similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/up diff --git a/root/etc/s6-overlay/s6-rc.d/user2/contents.d/99-ci-service-check b/root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user2/contents.d/99-ci-service-check rename to root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check From 53143efd2db37f696d2004e2865b0d8fc78c305a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 26 Feb 2023 16:23:58 +0000 Subject: [PATCH 3/7] Custom branding --- root/etc/s6-overlay/s6-rc.d/init-adduser/run | 51 +++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run index 2a0c256..b57b3f0 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -7,17 +7,19 @@ PGID=${PGID:-911} groupmod -o -g "$PGID" abc usermod -o -u "$PUID" abc -echo ' -------------------------------------- - _ () - | | ___ _ __ - | | / __| | | / \ - | | \__ \ | | | () | - |_| |___/ |_| \__/ +echo " +─────────────────────────────────────── + _____ __ __ _____ _____ _____ _____ + | | | | __|_ _| | | + | --| | |__ | | | | | | | | | + |_____|_____|_____| |_| |_____|_|_|_| + _____ __ __ _ __ ____ + | __ | | | | | | \ + | __ -| | | | |__| | | + |_____|_____|_|_____|____/ - -Brought to you by linuxserver.io --------------------------------------' + Based on images from linuxserver.io +───────────────────────────────────────" if [[ -f /donate.txt ]]; then echo ' To support the app dev(s) visit:' @@ -26,28 +28,29 @@ fi echo ' To support LSIO projects visit: https://www.linuxserver.io/donate/ -------------------------------------- + +─────────────────────────────────────── GID/UID --------------------------------------' +───────────────────────────────────────' echo " -User uid: $(id -u abc) -User gid: $(id -g abc) -------------------------------------- +User UID: $(id -u abc) +User GID: $(id -g abc) +─────────────────────────────────────── " time32="$(date +%Y)" if [[ "${time32}" == "1970" || "${time32}" == "1969" ]] && [ "$(uname -m)" == "armv7l" ]; then echo ' -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - -Your DockerHost is running an outdated version of libseccomp - -To fix this, please visit https://docs.linuxserver.io/faq#libseccomp - -Apps will not behave correctly without this - -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +╔═════════════════════════════════════════════════════════════════════════════╗ +║ ║ +║ Your Docker Host is running an outdated version of libseccomp ║ +║ ║ +║ To fix this, please visit https://docs.linuxserver.io/faq#libseccomp ║ +║ ║ +║ Apps will not behave correctly without this ║ +║ ║ +╚═════════════════════════════════════════════════════════════════════════════╝ ' sleep infinity fi From 15957aba51cb787048a8d56d44050adecbbb55b1 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 26 Feb 2023 16:46:58 +0000 Subject: [PATCH 4/7] Set first party env for CI --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5197cd..646bceb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { CI_PORT='80' CI_SSL='true' CI_DELAY='30' - CI_DOCKERENV='TZ=US/Pacific' + CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true' CI_AUTH='user:password' CI_WEBPATH='' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 10c4298..0fb4c5f 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -21,6 +21,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='true' - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific' + - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true' - CI_AUTH='user:password' - CI_WEBPATH='' From 1d22f5597379d4c606e2838e2dcb90bbcf8a68f2 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 26 Feb 2023 17:03:27 +0000 Subject: [PATCH 5/7] Split branding into its own file --- root/etc/s6-overlay/s6-rc.d/init-adduser/branding | 12 ++++++++++++ root/etc/s6-overlay/s6-rc.d/init-adduser/run | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-adduser/branding diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding new file mode 100644 index 0000000..99077a5 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -0,0 +1,12 @@ +─────────────────────────────────────── + _____ __ __ _____ _____ _____ _____ + | | | | __|_ _| | | + | --| | |__ | | | | | | | | | + |_____|_____|_____| |_| |_____|_|_|_| + _____ __ __ _ __ ____ + | __ | | | | | | \ + | __ -| | | | |__| | | + |_____|_____|_|_____|____/ + + Based on images from linuxserver.io +─────────────────────────────────────── diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run index b57b3f0..b98beff 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -7,19 +7,8 @@ PGID=${PGID:-911} groupmod -o -g "$PGID" abc usermod -o -u "$PUID" abc -echo " -─────────────────────────────────────── - _____ __ __ _____ _____ _____ _____ - | | | | __|_ _| | | - | --| | |__ | | | | | | | | | - |_____|_____|_____| |_| |_____|_|_|_| - _____ __ __ _ __ ____ - | __ | | | | | | \ - | __ -| | | | |__| | | - |_____|_____|_|_____|____/ +cat /etc/s6-overlay/s6-rc.d/init-adduser/branding - Based on images from linuxserver.io -───────────────────────────────────────" if [[ -f /donate.txt ]]; then echo ' To support the app dev(s) visit:' From 1275a243de0f5e9375d0551cab4535687747a149 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 09:51:08 +0000 Subject: [PATCH 6/7] Add netcat-openbsd due to busybox limitations --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 24d805a..c6d726c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,7 @@ RUN \ coreutils \ curl \ jq \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 376e938..2ed0b4c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -72,6 +72,7 @@ RUN \ coreutils \ curl \ jq \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index aa193a7..bd8477e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -72,6 +72,7 @@ RUN \ coreutils \ curl \ jq \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ From 0afa4ce2c3a16b01c56555d80dba23e3b2cd00f8 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:01:47 +0000 Subject: [PATCH 7/7] Remove copied contenv, source from mods now --- root/usr/bin/with-contenv | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 root/usr/bin/with-contenv diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv deleted file mode 100755 index e9e1bc8..0000000 --- a/root/usr/bin/with-contenv +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [[ -f /run/s6/container_environment/UMASK ]] && - { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] || - [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] || - [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then - umask "$(cat /run/s6/container_environment/UMASK)" -fi -exec /command/with-contenv "$@"