From d2c2963fadd21e61a4d8b296dac21dfbf2cf93c1 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:24:43 +0000 Subject: [PATCH 1/6] 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 6885b0281faab02e39fdd0b172f45480472f83a7 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:25:02 +0000 Subject: [PATCH 2/6] 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 041a1544c91b2f9e19db4fed34bebd0eea2d3909 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:25:17 +0000 Subject: [PATCH 3/6] 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 "$@" From 78135668f93eaab9729431f68285fe770dca4693 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:26:25 +0000 Subject: [PATCH 4/6] Custom branding --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- .../s6-overlay/s6-rc.d/init-adduser/branding | 12 +++++ root/etc/s6-overlay/s6-rc.d/init-adduser/run | 46 ++++++++----------- 4 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-adduser/branding diff --git a/Jenkinsfile b/Jenkinsfile index e44e369..c99d99e 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 1fd7ca7..7867704 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='' 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 a619c4f..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,17 +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 - -Brought to you by linuxserver.io --------------------------------------' if [[ -f /donate.txt ]]; then echo ' To support the app dev(s) visit:' @@ -26,32 +17,33 @@ 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 -chown abc:abc /app -chown abc:abc /config -chown abc:abc /defaults +lsiown abc:abc /app +lsiown abc:abc /config +lsiown abc:abc /defaults From 3360715d1eccb4e5cd496aaf12bf15be1ce34baf Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 11:27:06 +0000 Subject: [PATCH 5/6] Add netcat-openbsd --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b1f28e..1ef5b63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,7 @@ RUN \ coreutils \ curl \ jq \ - procps \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5152a30..5b6523e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -78,7 +78,7 @@ RUN \ coreutils \ curl \ jq \ - procps \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 45832f8..d0d2abe 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -78,7 +78,7 @@ RUN \ coreutils \ curl \ jq \ - procps \ + netcat-openbsd \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ From 78c1fc4b3fb79cbcb9418e1e47fde4bab1137e1c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 1 Mar 2023 19:53:35 +0000 Subject: [PATCH 6/6] Restore procps --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1ef5b63..a9231f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,6 +79,7 @@ RUN \ curl \ jq \ netcat-openbsd \ + procps \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5b6523e..6869bba 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -79,6 +79,7 @@ RUN \ curl \ jq \ netcat-openbsd \ + procps \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d0d2abe..e3e756d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -79,6 +79,7 @@ RUN \ curl \ jq \ netcat-openbsd \ + procps \ shadow \ tzdata && \ echo "**** create abc user and make our folders ****" && \