From 1d9f2f38627d106a76d14ee65de0bf397c84fc55 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Jun 2022 08:34:23 +0200 Subject: [PATCH 1/7] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e545c36..e769530 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,10 +1,10 @@ -alpine-baselayout-3.2.0-r21 -alpine-baselayout-data-3.2.0-r21 +alpine-baselayout-3.2.0-r22 +alpine-baselayout-data-3.2.0-r22 alpine-keys-2.4-r1 apk-tools-2.12.9-r3 bash-5.1.16-r2 brotli-libs-1.0.9-r6 -busybox-1.35.0-r13 +busybox-1.35.0-r14 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.1-r0 @@ -29,7 +29,7 @@ readline-8.1.2-r0 scanelf-1.3.4-r0 shadow-4.10-r3 skalibs-2.11.2.0-r0 -ssl_client-1.35.0-r13 +ssl_client-1.35.0-r14 tzdata-2022a-r0 utmps-libs-0.1.2.0-r0 xz-5.2.5-r1 From d69c94cc2f74f72bcef842b0b6a17e9b77fb3281 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 14 Jun 2022 16:05:51 +0100 Subject: [PATCH 2/7] Set s6 service max timeout to 0 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 531216a..063595d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,8 @@ LABEL maintainer="TheLamer" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ -TERM="xterm" +TERM="xterm" \ +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index daec099..03c98fd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -69,7 +69,8 @@ LABEL maintainer="TheLamer" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ -TERM="xterm" +TERM="xterm" \ +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 40467e3..e46f1f3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -69,7 +69,8 @@ LABEL maintainer="TheLamer" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ HOME="/root" \ -TERM="xterm" +TERM="xterm" \ +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" RUN \ echo "**** install runtime packages ****" && \ From 92595b45d83e4d874d9701ce9a3f5488a3bb34d9 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 20 Jun 2022 19:58:23 +0100 Subject: [PATCH 3/7] Fix umask handling for v3 --- root/usr/bin/with-contenv | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv index e26f8f4..212d908 100755 --- a/root/usr/bin/with-contenv +++ b/root/usr/bin/with-contenv @@ -1,7 +1,9 @@ #! /bin/bash -if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then - umask $(cat /var/run/s6/container_environment/UMASK) - exec /command/with-contenv "$@" -else - exec /command/with-contenv "$@" + +if [[ -f /var/run/s6/container_environment/UMASK ]] && \ + { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] || \ + [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] || \ + [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then + umask $(cat /var/run/s6/container_environment/UMASK) fi +exec /command/with-contenv "$@" From 97f69b8423eb36ccbcee6dd665e0bb3369059628 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Jul 2022 08:34:46 +0200 Subject: [PATCH 4/7] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e769530..9a8329e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,16 +8,16 @@ busybox-1.35.0-r14 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.1-r0 -curl-7.83.1-r1 +curl-7.83.1-r2 gmp-6.2.1-r2 libacl-2.3.1-r0 libattr-2.5.1-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1o-r0 -libcurl-7.83.1-r1 +libcrypto1.1-1.1.1p-r0 +libcurl-7.83.1-r2 libintl-0.21-r2 libproc-3.3.17-r1 -libssl1.1-1.1.1o-r0 +libssl1.1-1.1.1p-r0 linux-pam-1.5.2-r0 musl-1.2.3-r0 musl-utils-1.2.3-r0 From 5f3a505a50dc9ded570f191f042f2ade1b47904e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jul 2022 01:36:02 -0500 Subject: [PATCH 5/7] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9a8329e..2fe5c6f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,11 +13,11 @@ gmp-6.2.1-r2 libacl-2.3.1-r0 libattr-2.5.1-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1p-r0 +libcrypto1.1-1.1.1q-r0 libcurl-7.83.1-r2 libintl-0.21-r2 libproc-3.3.17-r1 -libssl1.1-1.1.1p-r0 +libssl1.1-1.1.1q-r0 linux-pam-1.5.2-r0 musl-1.2.3-r0 musl-utils-1.2.3-r0 From 90d9d04a6693648e135320d3d8e26604837aacb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 19 Jul 2022 08:34:46 +0200 Subject: [PATCH 6/7] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2fe5c6f..aa51db0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alpine-keys-2.4-r1 apk-tools-2.12.9-r3 bash-5.1.16-r2 brotli-libs-1.0.9-r6 -busybox-1.35.0-r14 +busybox-1.35.0-r15 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.1-r0 @@ -29,7 +29,7 @@ readline-8.1.2-r0 scanelf-1.3.4-r0 shadow-4.10-r3 skalibs-2.11.2.0-r0 -ssl_client-1.35.0-r14 +ssl_client-1.35.0-r15 tzdata-2022a-r0 utmps-libs-0.1.2.0-r0 xz-5.2.5-r1 From bd084de07df04ea6e2bfd55e3da2bde89708e273 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 22 Jul 2022 15:46:30 +0100 Subject: [PATCH 7/7] Support hybrid mods --- root/docker-mods | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/root/docker-mods b/root/docker-mods index 732f167..ead588e 100755 --- a/root/docker-mods +++ b/root/docker-mods @@ -123,9 +123,23 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do --header "Authorization: Bearer ${TOKEN}" \ "${BLOB_URL}${SHALAYER}" -o \ /modtarball.tar.xz - tar xzf /modtarball.tar.xz -C / + mkdir -p /tmp/mod + tar xzf /modtarball.tar.xz -C /tmp/mod + if [ -d /tmp/mod/etc/s6-overlay ]; then + if [ -d /tmp/mod/etc/cont-init.d ]; then + rm -rf /tmp/mod/etc/cont-init.d + fi + if [ -d /tmp/mod/etc/services.d ]; then + rm -rf /tmp/mod/etc/services.d + fi + fi + shopt -s dotglob + cp -R /tmp/mod/* / + shopt -u dotglob + rm -rf /tmp/mod rm -rf /modtarball.tar.xz echo ${SHALAYER} > "/${FILENAME}" + echo "[mod-init] ${DOCKER_MOD} applied to container" fi done