From 9776d505b7ec0d012d8a75de0bf0952290ea33f3 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 15 Feb 2023 22:21:27 +0000 Subject: [PATCH] Migrate to s6v3 --- Dockerfile | 27 +-- Dockerfile.aarch64 | 27 +-- Dockerfile.armhf | 27 +-- .../etc/s6-linux-init/skel/rc.init.patch | 11 - root/docker-mods | 207 ------------------ root/etc/cont-init.d/01-envfile | 16 -- .../dependencies.d/init-migrations | 0 .../s6-rc.d/init-adduser/run} | 5 +- root/etc/s6-overlay/s6-rc.d/init-adduser/type | 1 + root/etc/s6-overlay/s6-rc.d/init-adduser/up | 1 + .../dependencies.d/init-config} | 0 .../s6-overlay/s6-rc.d/init-config-end/type | 1 + .../etc/s6-overlay/s6-rc.d/init-config-end/up | 1 + .../dependencies.d/init-os-end} | 0 root/etc/s6-overlay/s6-rc.d/init-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-config/up | 1 + .../dependencies.d/init-mods-end | 0 .../s6-rc.d/init-custom-files/run} | 0 .../s6-overlay/s6-rc.d/init-custom-files/type | 1 + .../s6-overlay/s6-rc.d/init-custom-files/up | 1 + .../init-envfile/dependencies.d/00-legacy | 0 root/etc/s6-overlay/s6-rc.d/init-envfile/run | 17 ++ root/etc/s6-overlay/s6-rc.d/init-envfile/type | 1 + root/etc/s6-overlay/s6-rc.d/init-envfile/up | 1 + .../init-migrations/dependencies.d/00-legacy | 0 .../s6-rc.d/init-migrations/run} | 0 .../s6-overlay/s6-rc.d/init-migrations/type | 1 + .../etc/s6-overlay/s6-rc.d/init-migrations/up | 1 + .../init-mods-end/dependencies.d/init-mods | 0 .../s6-rc.d/init-mods-package-install/run | 4 +- .../init-mods/dependencies.d/init-config-end | 0 .../s6-rc.d/init-os-end/dependencies.d/base | 0 .../init-os-end/dependencies.d/init-adduser | 0 .../init-os-end/dependencies.d/init-envfile | 0 .../dependencies.d/init-migrations | 0 root/etc/s6-overlay/s6-rc.d/init-os-end/type | 1 + root/etc/s6-overlay/s6-rc.d/init-os-end/up | 1 + .../dependencies.d/init-custom-files | 0 root/etc/s6-overlay/s6-rc.d/init-services/up | 2 +- .../s6-rc.d/user/contents.d/init-adduser | 0 .../s6-rc.d/user/contents.d/init-config | 0 .../s6-rc.d/user/contents.d/init-config-end | 0 .../s6-rc.d/user/contents.d/init-custom-files | 0 .../s6-rc.d/user/contents.d/init-envfile | 0 .../s6-rc.d/user/contents.d/init-migrations | 0 .../s6-rc.d/user/contents.d/init-os-end | 0 .../user2/contents.d/99-ci-service-check | 0 root/usr/bin/with-contenv | 12 +- 48 files changed, 85 insertions(+), 284 deletions(-) delete mode 100644 patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch delete mode 100755 root/docker-mods delete mode 100755 root/etc/cont-init.d/01-envfile rename ci-check/99-ci-service-check => root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations (100%) rename root/etc/{cont-init.d/10-adduser => s6-overlay/s6-rc.d/init-adduser/run} (95%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-adduser/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-adduser/up rename root/etc/s6-overlay/s6-rc.d/{99-ci-service-check/dependencies.d/base => init-config-end/dependencies.d/init-config} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/up rename root/etc/s6-overlay/s6-rc.d/{99-ci-service-check/dependencies.d/user => init-config/dependencies.d/init-os-end} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end rename root/etc/{cont-init.d/99-custom-files => s6-overlay/s6-rc.d/init-custom-files/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-custom-files/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-custom-files/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-envfile/dependencies.d/00-legacy create mode 100755 root/etc/s6-overlay/s6-rc.d/init-envfile/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-envfile/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-envfile/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-migrations/dependencies.d/00-legacy rename root/etc/{cont-init.d/01-migrations => s6-overlay/s6-rc.d/init-migrations/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-migrations/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-migrations/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end create mode 100644 root/etc/s6-overlay/s6-rc.d/user2/contents.d/99-ci-service-check diff --git a/Dockerfile b/Dockerfile index 0526755..9739731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 as rootfs-stage +FROM alpine:3.16 as rootfs-stage # environment ENV REL=focal @@ -8,8 +8,6 @@ RUN \ apk add --no-cache \ bash \ curl \ - patch \ - tar \ tzdata \ xz @@ -21,7 +19,9 @@ RUN \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ tar xf \ /rootfs.tar.gz -C \ - /root-out + /root-out && \ + rm -rf \ + /root-out/var/log/* # set version for s6 overlay ARG S6_OVERLAY_VERSION="3.1.2.1" @@ -39,28 +39,26 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -# copy ci-checks -COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d - -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / ARG BUILD_DATE ARG VERSION +ARG MODS_VERSION="v3" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" + # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ LANGUAGE="en_US.UTF-8" \ LANG="en_US.UTF-8" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods # copy sources COPY sources.list /etc/apt/ @@ -107,6 +105,8 @@ RUN \ apt-get install -y \ curl \ gnupg \ + jq \ + netcat \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -123,7 +123,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a3d2b81..2c899b9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM alpine:3.15 as rootfs-stage +FROM alpine:3.16 as rootfs-stage # environment ENV REL=focal @@ -8,8 +8,6 @@ RUN \ apk add --no-cache \ bash \ curl \ - patch \ - tar \ tzdata \ xz @@ -21,7 +19,9 @@ RUN \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ tar xf \ /rootfs.tar.gz -C \ - /root-out + /root-out && \ + rm -rf \ + /root-out/var/log/* # set version for s6 overlay ARG S6_OVERLAY_VERSION="3.1.2.1" @@ -39,28 +39,26 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -# copy ci-checks -COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d - -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / ARG BUILD_DATE ARG VERSION +ARG MODS_VERSION="v3" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" + # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ LANGUAGE="en_US.UTF-8" \ LANG="en_US.UTF-8" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods # copy sources COPY sources.list.arm /etc/apt/sources.list @@ -107,6 +105,8 @@ RUN \ apt-get install -y \ curl \ gnupg \ + jq \ + netcat \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -128,7 +128,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 92b5d71..bdfd2ac 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM alpine:3.15 as rootfs-stage +FROM alpine:3.16 as rootfs-stage # environment ENV REL=focal @@ -8,8 +8,6 @@ RUN \ apk add --no-cache \ bash \ curl \ - patch \ - tar \ tzdata \ xz @@ -21,7 +19,9 @@ RUN \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ tar xf \ /rootfs.tar.gz -C \ - /root-out + /root-out && \ + rm -rf \ + /root-out/var/log/* # set version for s6 overlay ARG S6_OVERLAY_VERSION="3.1.2.1" @@ -39,28 +39,26 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -# copy ci-checks -COPY ci-check/ /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-rc/sources/top/contents.d - -# patch cont-init for docker-mods -COPY patch/ /tmp/patch -RUN patch -u /root-out/package/admin/s6-overlay-${S6_OVERLAY_VERSION}/etc/s6-linux-init/skel/rc.init -i /tmp/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch - # Runtime stage FROM scratch COPY --from=rootfs-stage /root-out/ / ARG BUILD_DATE ARG VERSION +ARG MODS_VERSION="v3" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" + # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ LANGUAGE="en_US.UTF-8" \ LANG="en_US.UTF-8" \ TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" +S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ +S6_VERBOSITY=1 \ +S6_STAGE2_HOOK=/docker-mods # copy sources COPY sources.list.arm /etc/apt/sources.list @@ -107,6 +105,8 @@ RUN \ apt-get install -y \ curl \ gnupg \ + jq \ + netcat \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -128,7 +128,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch b/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch deleted file mode 100644 index b01a7f0..0000000 --- a/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rc.init 2022-05-20 17:41:11.195721000 -0500 -+++ rc.init.patched 2022-05-20 17:41:37.646586700 -0500 -@@ -6,6 +6,8 @@ - s6-chmod 0755 /run/s6/container_environment - fi - -+/docker-mods -+ - if profile=`printcontenv S6_RUNTIME_PROFILE` ; then - etc="/etc/cont-profile.d/$profile" - else diff --git a/root/docker-mods b/root/docker-mods deleted file mode 100755 index d82fa7e..0000000 --- a/root/docker-mods +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# Set executable bit on cont-init and services built into the image -set_legacy_executable_bits() { - mkdir -p /etc/{cont-init.d,services.d} - chmod +x \ - /etc/cont-init.d/* \ - /etc/services.d/*/* 2>/dev/null || true -} - -tamper_check() { - #Tamper check custom service locations - if [[ -d "${SERVICES_DIR}" ]] && [[ -n "$(find ${SERVICES_DIR}/* ! -user root 2>/dev/null)" ]]; then - echo "[custom-init] **** Some of the contents of the folder '${SERVICES_DIR}' are not owned by root, which is a security risk. ****" - echo "[custom-init] **** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****" - elif [[ -d "${SERVICES_DIR}" ]] && [[ -n "$(find ${SERVICES_DIR}/* -perm -o+w 2>/dev/null)" ]]; then - echo "[custom-init] **** Some of the contents of the folder '${SERVICES_DIR}' have write permissions for others, which is a security risk. ****" - echo "[custom-init] **** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****" - fi - #Tamper check custom script locations - if [[ -d "${SCRIPTS_DIR}" ]] && [[ -n "$(find ${SCRIPTS_DIR}/* ! -user root 2>/dev/null)" ]]; then - echo "[custom-init] **** Some of the contents of the folder '${SCRIPTS_DIR}' are not owned by root, which is a security risk. ****" - echo "[custom-init] **** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****" - elif [[ -d "${SCRIPTS_DIR}" ]] && [[ -n "$(find ${SCRIPTS_DIR}/* -perm -o+w 2>/dev/null)" ]]; then - echo "[custom-init] **** Some of the contents of the folder '${SCRIPTS_DIR}' have write permissions for others, which is a security risk. ****" - echo "[custom-init] **** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****" - fi -} - -process_custom_services() { - # Remove all existing custom services before continuing to ensure - # we aren't running anything the user may have removed - if [[ -n "$(/bin/ls -A /etc/s6-overlay/s6-rc.d/custom-svc-* 2>/dev/null)" ]]; then - echo "[custom-init] removing existing custom services..." - rm -rf /etc/s6-overlay/s6-rc.d/custom-svc-* - rm /etc/s6-overlay/s6-rc.d/user/contents.d/custom-svc-* - fi - - # Make sure custom service directory exists and has files in it - if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]]; then - echo "[custom-init] Service files found in ${SERVICES_DIR}" - for SERVICE in "${SERVICES_DIR}"/*; do - NAME="$(basename "${SERVICE}")" - if [[ -f "${SERVICE}" ]]; then - echo "[custom-init] ${NAME}: service detected, copying..." - mkdir -p /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/ - cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run - chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run - echo "longrun" >/etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type - touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services - touch /etc/s6-overlay/s6-rc.d/user/contents.d/custom-svc-"${NAME}" - echo "[custom-init] ${NAME}: copied" - elif [[ ! -f "${SERVICE}" ]]; then - echo "[custom-init] ${NAME}: is not a file" - fi - done - else - echo "[custom-init] No custom services found, skipping..." - fi -} - -# Check for curl -curl_check() { - if [[ ! -f /usr/bin/curl ]] || [[ ! -f /usr/bin/jq ]]; then - echo "[mod-init] Curl/JQ was not found on this system for Docker mods installing" - if [[ -f /usr/bin/apt ]]; then - ## Ubuntu - export DEBIAN_FRONTEND="noninteractive" - apt-get update - apt-get install --no-install-recommends -y \ - curl \ - jq - elif [[ -f /sbin/apk ]]; then - # Alpine - apk add --no-cache \ - curl \ - jq - fi - fi -} - -# Use different filtering depending on URL -get_blob_sha() { - if [[ $1 == "ghcr" ]]; then - curl -f --retry 10 --retry-max-time 60 --retry-connrefused \ - --silent \ - --location \ - --request GET \ - --header "Authorization: Bearer $2" \ - "$3" | jq -r '.layers[0].digest' - else - curl -f --retry 10 --retry-max-time 60 --retry-connrefused \ - --silent \ - --location \ - --request GET \ - --header "Authorization: Bearer $2" \ - "$3" | jq -r '.fsLayers[0].blobSum' - fi -} - -# Main run logic -run_mods() { - echo "[mod-init] Attempting to run Docker Modification Logic" - for DOCKER_MOD in $(echo "${DOCKER_MODS}" | tr '|' '\n'); do - # Support alternative endpoints - if [[ ${DOCKER_MOD} == ghcr.io/* ]] || [[ ${DOCKER_MOD} == linuxserver/* ]]; then - DOCKER_MOD="${DOCKER_MOD#ghcr.io/*}" - ENDPOINT="${DOCKER_MOD%%:*}" - USERNAME="${DOCKER_MOD%%/*}" - REPO="${ENDPOINT#*/}" - TAG="${DOCKER_MOD#*:}" - if [[ ${TAG} == "${DOCKER_MOD}" ]]; then - TAG="latest" - fi - FILENAME="${USERNAME}.${REPO}.${TAG}" - AUTH_URL="https://ghcr.io/token?scope=repository%3A${USERNAME}%2F${REPO}%3Apull" - MANIFEST_URL="https://ghcr.io/v2/${ENDPOINT}/manifests/${TAG}" - BLOB_URL="https://ghcr.io/v2/${ENDPOINT}/blobs/" - MODE="ghcr" - else - ENDPOINT="${DOCKER_MOD%%:*}" - USERNAME="${DOCKER_MOD%%/*}" - REPO="${ENDPOINT#*/}" - TAG="${DOCKER_MOD#*:}" - if [[ ${TAG} == "${DOCKER_MOD}" ]]; then - TAG="latest" - fi - FILENAME="${USERNAME}.${REPO}.${TAG}" - AUTH_URL="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ENDPOINT}:pull" - MANIFEST_URL="https://registry-1.docker.io/v2/${ENDPOINT}/manifests/${TAG}" - BLOB_URL="https://registry-1.docker.io/v2/${ENDPOINT}/blobs/" - MODE="dockerhub" - fi - # Kill off modification logic if any of the usernames are banned - for BANNED in $(curl -s https://raw.githubusercontent.com/linuxserver/docker-mods/master/blacklist.txt); do - if [[ "${BANNED,,}" == "${USERNAME,,}" ]]; then - if [[ -z ${RUN_BANNED_MODS+x} ]]; then - echo "[mod-init] ${DOCKER_MOD} is banned from use due to reported abuse aborting mod logic" - return - else - echo "[mod-init] You have chosen to run banned mods ${DOCKER_MOD} will be applied" - fi - fi - done - echo "[mod-init] Applying ${DOCKER_MOD} files to container" - # Get Dockerhub token for api operations - TOKEN="$( - curl -f --retry 10 --retry-max-time 60 --retry-connrefused \ - --silent \ - --header 'GET' \ - "${AUTH_URL}" | - jq -r '.token' - )" - # Determine first and only layer of image - SHALAYER=$(get_blob_sha "${MODE}" "${TOKEN}" "${MANIFEST_URL}") - # Check if we have allready applied this layer - if [[ -f "/${FILENAME}" ]] && [[ "${SHALAYER}" == "$(cat /"${FILENAME}")" ]]; then - echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping" - else - # Download and extract layer to / - curl -f --retry 10 --retry-max-time 60 --retry-connrefused \ - --silent \ - --location \ - --request GET \ - --header "Authorization: Bearer ${TOKEN}" \ - "${BLOB_URL}${SHALAYER}" -o \ - /modtarball.tar.xz - 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 -} - -# Main script loop - -SCRIPTS_DIR="/custom-cont-init.d" -SERVICES_DIR="/custom-services.d" - -if [ -d "/custom-cont-init.d" ] || [ -d "/custom-services.d" ]; then - tamper_check - process_custom_services -fi - -# Run mod logic -if [[ -n "${DOCKER_MODS+x}" ]]; then - curl_check - run_mods -fi - -# Set executable bit on legacy cont-init and services built into the image and anything legacy unpacked by mods -set_legacy_executable_bits diff --git a/root/etc/cont-init.d/01-envfile b/root/etc/cont-init.d/01-envfile deleted file mode 100755 index 32e2450..0000000 --- a/root/etc/cont-init.d/01-envfile +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash - -if [[ "$(ls /var/run/s6/container_environment/ | xargs)" == *"FILE__"* ]]; then - for FILENAME in /var/run/s6/container_environment/*; do - if [[ "${FILENAME##*/}" == "FILE__"* ]]; then - SECRETFILE=$(cat ${FILENAME}) - if [[ -f ${SECRETFILE} ]]; then - FILESTRIP=${FILENAME//FILE__/} - cat ${SECRETFILE} > ${FILESTRIP} - echo "[env-init] ${FILESTRIP##*/} set from ${FILENAME##*/}" - else - echo "[env-init] cannot find secret in ${FILENAME##*/}" - fi - fi - done -fi diff --git a/ci-check/99-ci-service-check b/root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations similarity index 100% rename from ci-check/99-ci-service-check rename to root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations diff --git a/root/etc/cont-init.d/10-adduser b/root/etc/s6-overlay/s6-rc.d/init-adduser/run similarity index 95% rename from root/etc/cont-init.d/10-adduser rename to root/etc/s6-overlay/s6-rc.d/init-adduser/run index 1cbae76..a619c4f 100755 --- a/root/etc/cont-init.d/10-adduser +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash PUID=${PUID:-911} PGID=${PGID:-911} @@ -37,7 +38,7 @@ User gid: $(id -g abc) time32="$(date +%Y)" if [[ "${time32}" == "1970" || "${time32}" == "1969" ]] && [ "$(uname -m)" == "armv7l" ]; then - echo ' + echo ' @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ Your DockerHost is running an outdated version of libseccomp @@ -48,7 +49,7 @@ Apps will not behave correctly without this @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ' -sleep infinity + sleep infinity fi chown abc:abc /app diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/type b/root/etc/s6-overlay/s6-rc.d/init-adduser/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/up b/root/etc/s6-overlay/s6-rc.d/init-adduser/up new file mode 100644 index 0000000..b8522da --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-adduser/run diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/type b/root/etc/s6-overlay/s6-rc.d/init-config-end/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-config-end/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/up b/root/etc/s6-overlay/s6-rc.d/init-config-end/up new file mode 100644 index 0000000..c329423 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-config-end/up @@ -0,0 +1 @@ +# This file doesn't do anything, it's just the end of the downstream image init process diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user rename to root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/type b/root/etc/s6-overlay/s6-rc.d/init-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/up b/root/etc/s6-overlay/s6-rc.d/init-config/up new file mode 100644 index 0000000..e80acfe --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-config/up @@ -0,0 +1 @@ +# This file doesn't do anything, it's just the start of the downstream image init process diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/99-custom-files b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run similarity index 100% rename from root/etc/cont-init.d/99-custom-files rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/type b/root/etc/s6-overlay/s6-rc.d/init-custom-files/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-custom-files/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/up b/root/etc/s6-overlay/s6-rc.d/init-custom-files/up new file mode 100644 index 0000000..28bf318 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-custom-files/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-custom-files/run 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 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-envfile/run b/root/etc/s6-overlay/s6-rc.d/init-envfile/run new file mode 100755 index 0000000..5dbf809 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-envfile/run @@ -0,0 +1,17 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +if find /run/s6/container_environment/*"FILE__"* -maxdepth 1 > /dev/null 2>&1; then + for FILENAME in /run/s6/container_environment/*; do + if [[ "${FILENAME##*/}" == "FILE__"* ]]; then + SECRETFILE=$(cat "${FILENAME}") + if [[ -f ${SECRETFILE} ]]; then + FILESTRIP=${FILENAME//FILE__/} + cat "${SECRETFILE}" >"${FILESTRIP}" + echo "[env-init] ${FILESTRIP##*/} set from ${FILENAME##*/}" + else + echo "[env-init] cannot find secret in ${FILENAME##*/}" + fi + fi + done +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-envfile/type b/root/etc/s6-overlay/s6-rc.d/init-envfile/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-envfile/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-envfile/up b/root/etc/s6-overlay/s6-rc.d/init-envfile/up new file mode 100644 index 0000000..b2b4fb8 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-envfile/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-envfile/run 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 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/01-migrations b/root/etc/s6-overlay/s6-rc.d/init-migrations/run similarity index 100% rename from root/etc/cont-init.d/01-migrations rename to root/etc/s6-overlay/s6-rc.d/init-migrations/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-migrations/type b/root/etc/s6-overlay/s6-rc.d/init-migrations/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-migrations/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-migrations/up b/root/etc/s6-overlay/s6-rc.d/init-migrations/up new file mode 100644 index 0000000..7c4cbcf --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-migrations/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-migrations/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run index 81987dc..90b4b2e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run @@ -4,7 +4,7 @@ if [[ -f "/mod-repo-packages-to-install.list" ]]; then IFS=' ' read -ra REPO_PACKAGES <<< "$(tr '\n' ' ' < /mod-repo-packages-to-install.list)" if [[ ${#REPO_PACKAGES[@]} -ne 0 ]] && [[ ${REPO_PACKAGES[*]} != "" ]]; then - echo "**** Installing all mod packages ****" + echo "[mod-init] **** Installing all mod packages ****" if [[ -f /usr/bin/apt ]]; then export DEBIAN_FRONTEND="noninteractive" apt-get update @@ -20,7 +20,7 @@ fi if [[ -f "/mod-pip-packages-to-install.list" ]]; then IFS=' ' read -ra PIP_PACKAGES <<< "$(tr '\n' ' ' < /mod-pip-packages-to-install.list)" if [[ ${#PIP_PACKAGES[@]} -ne 0 ]] && [[ ${PIP_PACKAGES[*]} != "" ]]; then - echo "**** Installing all pip packages ****" + echo "[mod-init] **** Installing all pip packages ****" python3 -m pip install -U pip wheel setuptools PIP_ARGS=() if [[ -f /usr/bin/apt ]]; then diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end b/root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/type b/root/etc/s6-overlay/s6-rc.d/init-os-end/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-os-end/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/up b/root/etc/s6-overlay/s6-rc.d/init-os-end/up new file mode 100644 index 0000000..092149d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-os-end/up @@ -0,0 +1 @@ +# This file doesn't do anything, it's just the end of the mod init process diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/up b/root/etc/s6-overlay/s6-rc.d/init-services/up index cd262c7..a7c3905 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-services/up +++ b/root/etc/s6-overlay/s6-rc.d/init-services/up @@ -1 +1 @@ -# This file doesn't do anything, it's just the start of the service init process +# This file doesn't do anything, it just signals that services can start diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end new file mode 100644 index 0000000..e69de29 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/99-ci-service-check new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv index 212d908..e9e1bc8 100755 --- a/root/usr/bin/with-contenv +++ b/root/usr/bin/with-contenv @@ -1,9 +1,9 @@ -#! /bin/bash +#!/bin/bash -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) +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 "$@"