diff --git a/Dockerfile b/Dockerfile index 7beff97..54225f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,59 +1,12 @@ # syntax=docker/dockerfile:1 ARG BUILD_BASE_IMAGE -FROM ${BUILD_BASE_IMAGE} AS rootfs-stage +FROM ${BUILD_BASE_IMAGE} ARG BUILD_APP_VERSION ARG BUILD_S6_ARCH_amd64 ARG BUILD_S6_OVERLAY_VERSION -ARG ROOTFS=/root-out ARG BUILD_DEBIAN_REL ARG BUILD_DEBIAN_ARCH -ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine -ARG PACKAGES=alpine-baselayout,\ -alpine-keys,\ -apk-tools,\ -busybox,\ -libc-utils - -# install packages -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz - -# grab base tarball -RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://github.com/debuerreotype/docker-debian-artifacts/raw/refs/heads/dist-${BUILD_DEBIAN_ARCH}/${BUILD_DEBIAN_REL}/slim/oci/blobs/rootfs.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz - -# add s6 optional symlinks -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /root-out/usr/bin/with-contenv -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz - -######################### -# Runtime stage - -FROM scratch -COPY --from=rootfs-stage /root-out/ / - ARG BUILD_DATE ARG BUILD_APP_VERSION ARG MODS_VERSION="v3" @@ -63,19 +16,36 @@ ARG WITHCONTENV_VERSION="v1" ARG BUILD_APP_GID ARG BUILD_APP_USER ARG BUILD_MAINTAINER +ARG DEBIAN_FRONTEND="noninteractive" LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + xz-utils \ + tzdata + +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz + +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /usr/bin/with-contenv +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz + ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" # set environment variables -ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ - LANGUAGE="en_US.UTF-8" \ - LANG="en_US.UTF-8" \ + LANGUAGE="de_DE.UTF-8" \ + LANG="de_DE.UTF-8" \ TERM="xterm" \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ S6_VERBOSITY=1 \ @@ -83,39 +53,7 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - echo '#!/bin/sh' \ - > /usr/sbin/policy-rc.d && \ - echo 'exit 101' \ - >> /usr/sbin/policy-rc.d && \ - chmod +x \ - /usr/sbin/policy-rc.d && \ - dpkg-divert --local --rename --add /sbin/initctl && \ - cp -a \ - /usr/sbin/policy-rc.d \ - /sbin/initctl && \ - sed -i \ - 's/^exit.*/exit 0/' \ - /sbin/initctl && \ - echo 'force-unsafe-io' \ - > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ - echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - > /etc/apt/apt.conf.d/docker-clean && \ - echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Acquire::Languages "none";' \ - > /etc/apt/apt.conf.d/docker-no-languages && \ - echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ - > /etc/apt/apt.conf.d/docker-gzip-indexes && \ - echo 'Apt::AutoRemove::SuggestsImportant "false";' \ - > /etc/apt/apt.conf.d/docker-autoremove-suggests && \ - mkdir -p /run/systemd && \ - echo 'docker' \ - > /run/systemd/container && \ - echo "**** install apt-utils and locales ****" && \ +RUN echo "**** install apt-utils and locales ****" && \ apt-get update && \ apt-get upgrade -y && \ apt-get install -y \ @@ -141,10 +79,10 @@ RUN \ echo "deb-src http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ rm -f /etc/apt/sources.list.d/debian.sources && \ echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ + locale-gen de_DE.UTF-8 && \ echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ + useradd -u 911 -U -d /config -s /bin/false ${BUILD_APP_USER} && \ + usermod -G users ${BUILD_APP_USER} && \ mkdir -p \ /app \ /config \ @@ -162,5 +100,5 @@ RUN \ # add local files COPY root/ / - +RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 622aba7..bc9dded 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,59 +1,12 @@ # syntax=docker/dockerfile:1 ARG BUILD_BASE_IMAGE -FROM ${BUILD_BASE_IMAGE} AS rootfs-stage +FROM ${BUILD_BASE_IMAGE} ARG BUILD_APP_VERSION ARG BUILD_S6_ARCH_aarch64 ARG BUILD_S6_OVERLAY_VERSION -ARG ROOTFS=/root-out ARG BUILD_DEBIAN_REL ARG BUILD_DEBIAN_ARCH_AARCH64 -ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine -ARG PACKAGES=alpine-baselayout,\ -alpine-keys,\ -apk-tools,\ -busybox,\ -libc-utils - -# install packages -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz - -# grab base tarball -RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://github.com/debuerreotype/docker-debian-artifacts/raw/refs/heads/dist-${BUILD_DEBIAN_ARCH_AARCH64}/${BUILD_DEBIAN_REL}/slim/oci/blobs/rootfs.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz - -# add s6 optional symlinks -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /root-out/usr/bin/with-contenv -ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz - -######################### -# Runtime stage - -FROM scratch -COPY --from=rootfs-stage /root-out/ / - ARG BUILD_DATE ARG BUILD_APP_VERSION ARG MODS_VERSION="v3" @@ -63,19 +16,36 @@ ARG WITHCONTENV_VERSION="v1" ARG BUILD_APP_GID ARG BUILD_APP_USER ARG BUILD_MAINTAINER +ARG DEBIAN_FRONTEND="noninteractive" LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + xz-utils \ + tzdata + +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz + +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /usr/bin/with-contenv +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz + ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" # set environment variables -ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ - LANGUAGE="en_US.UTF-8" \ - LANG="en_US.UTF-8" \ + LANGUAGE="de_DE.UTF-8" \ + LANG="de_DE.UTF-8" \ TERM="xterm" \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ S6_VERBOSITY=1 \ @@ -83,39 +53,7 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - echo '#!/bin/sh' \ - > /usr/sbin/policy-rc.d && \ - echo 'exit 101' \ - >> /usr/sbin/policy-rc.d && \ - chmod +x \ - /usr/sbin/policy-rc.d && \ - dpkg-divert --local --rename --add /sbin/initctl && \ - cp -a \ - /usr/sbin/policy-rc.d \ - /sbin/initctl && \ - sed -i \ - 's/^exit.*/exit 0/' \ - /sbin/initctl && \ - echo 'force-unsafe-io' \ - > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ - echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - > /etc/apt/apt.conf.d/docker-clean && \ - echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Acquire::Languages "none";' \ - > /etc/apt/apt.conf.d/docker-no-languages && \ - echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ - > /etc/apt/apt.conf.d/docker-gzip-indexes && \ - echo 'Apt::AutoRemove::SuggestsImportant "false";' \ - > /etc/apt/apt.conf.d/docker-autoremove-suggests && \ - mkdir -p /run/systemd && \ - echo 'docker' \ - > /run/systemd/container && \ - echo "**** install apt-utils and locales ****" && \ +RUN echo "**** install apt-utils and locales ****" && \ apt-get update && \ apt-get upgrade -y && \ apt-get install -y \ @@ -141,10 +79,10 @@ RUN \ echo "deb-src http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ rm -f /etc/apt/sources.list.d/debian.sources && \ echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ + locale-gen de_DE.UTF-8 && \ echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ + useradd -u 911 -U -d /config -s /bin/false ${BUILD_APP_USER} && \ + usermod -G users ${BUILD_APP_USER} && \ mkdir -p \ /app \ /config \ @@ -162,5 +100,5 @@ RUN \ # add local files COPY root/ / - +RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/buildargs.env b/buildargs.env index 114d4b9..a5d1c73 100644 --- a/buildargs.env +++ b/buildargs.env @@ -1,18 +1,18 @@ ## BUILD STAGE -BUILD_BASE_TAG=3.23 +BUILD_BASE_TAG=trixie-slim BUILD_TAG_LATEST=y -BUILD_BASE_IMAGE=alpine:3.23 +BUILD_BASE_IMAGE=debian:trixie-slim ## Examples for BUILD_BASE_IMAGE # alpine:${BUILD_TAG} # git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG} -BUILD_ALPINE_ARCH_AMD64=x86_64 -BUILD_ALPINE_ARCH_AARCH64=aarch64 +#BUILD_ALPINE_ARCH_AMD64=x86_64 +#BUILD_ALPINE_ARCH_AARCH64=aarch64 BUILD_DEBIAN_ARCH=amd64 BUILD_DEBIAN_ARCH_AARCH64=arm64v8 BUILD_DEBIAN_REL=trixie BUILD_S6_ARCH_amd64=x86_64 BUILD_S6_ARCH_aarch64=aarch64 -BUILD_S6_OVERLAY_VERSION=3.2.1.0 +BUILD_S6_OVERLAY_VERSION=3.2.2.0 BUILD_MAINTAINER=pi-farm BUILD_APP_VERSION=trixie-slim BUILD_APP_NAME=baseimage-debian diff --git a/root/s6-overlay/s6-rc.d/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/s6-overlay/s6-rc.d/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/s6-overlay/s6-rc.d/ci-service-check/type b/root/etc/s6-overlay/s6-rc.d/ci-service-check/type similarity index 100% rename from root/s6-overlay/s6-rc.d/ci-service-check/type rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/type diff --git a/root/s6-overlay/s6-rc.d/ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/ci-service-check/up similarity index 100% rename from root/s6-overlay/s6-rc.d/ci-service-check/up rename to root/etc/s6-overlay/s6-rc.d/ci-service-check/up diff --git a/root/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding similarity index 100% rename from root/s6-overlay/s6-rc.d/init-adduser/branding rename to root/etc/s6-overlay/s6-rc.d/init-adduser/branding diff --git a/root/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations similarity index 100% rename from root/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations rename to root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-migrations diff --git a/root/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-adduser/run rename to root/etc/s6-overlay/s6-rc.d/init-adduser/run diff --git a/root/s6-overlay/s6-rc.d/init-adduser/type b/root/etc/s6-overlay/s6-rc.d/init-adduser/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-adduser/type rename to root/etc/s6-overlay/s6-rc.d/init-adduser/type diff --git a/root/s6-overlay/s6-rc.d/init-adduser/up b/root/etc/s6-overlay/s6-rc.d/init-adduser/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-adduser/up rename to root/etc/s6-overlay/s6-rc.d/init-adduser/up diff --git a/root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config diff --git a/root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config diff --git a/root/s6-overlay/s6-rc.d/init-config-end/type b/root/etc/s6-overlay/s6-rc.d/init-config-end/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config-end/type rename to root/etc/s6-overlay/s6-rc.d/init-config-end/type diff --git a/root/s6-overlay/s6-rc.d/init-config-end/up b/root/etc/s6-overlay/s6-rc.d/init-config-end/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config-end/up rename to root/etc/s6-overlay/s6-rc.d/init-config-end/up diff --git a/root/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end rename to root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-os-end diff --git a/root/s6-overlay/s6-rc.d/init-config/type b/root/etc/s6-overlay/s6-rc.d/init-config/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config/type rename to root/etc/s6-overlay/s6-rc.d/init-config/type diff --git a/root/s6-overlay/s6-rc.d/init-config/up b/root/etc/s6-overlay/s6-rc.d/init-config/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-config/up rename to root/etc/s6-overlay/s6-rc.d/init-config/up diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config similarity index 100% rename from root/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-crontab-config/run rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-crontab-config/type rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/type diff --git a/root/s6-overlay/s6-rc.d/init-crontab-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-crontab-config/up rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/up diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/run b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-custom-files/run rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/run diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/type b/root/etc/s6-overlay/s6-rc.d/init-custom-files/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-custom-files/type rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/type diff --git a/root/s6-overlay/s6-rc.d/init-custom-files/up b/root/etc/s6-overlay/s6-rc.d/init-custom-files/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-custom-files/up rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/up diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser similarity index 100% rename from root/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/run b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-device-perms/run rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/run diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/type b/root/etc/s6-overlay/s6-rc.d/init-device-perms/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-device-perms/type rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/type diff --git a/root/s6-overlay/s6-rc.d/init-device-perms/up b/root/etc/s6-overlay/s6-rc.d/init-device-perms/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-device-perms/up rename to root/etc/s6-overlay/s6-rc.d/init-device-perms/up diff --git a/root/s6-overlay/s6-rc.d/init-envfile/run b/root/etc/s6-overlay/s6-rc.d/init-envfile/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-envfile/run rename to root/etc/s6-overlay/s6-rc.d/init-envfile/run diff --git a/root/s6-overlay/s6-rc.d/init-envfile/type b/root/etc/s6-overlay/s6-rc.d/init-envfile/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-envfile/type rename to root/etc/s6-overlay/s6-rc.d/init-envfile/type diff --git a/root/s6-overlay/s6-rc.d/init-envfile/up b/root/etc/s6-overlay/s6-rc.d/init-envfile/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-envfile/up rename to root/etc/s6-overlay/s6-rc.d/init-envfile/up diff --git a/root/s6-overlay/s6-rc.d/init-migrations/run b/root/etc/s6-overlay/s6-rc.d/init-migrations/run similarity index 100% rename from root/s6-overlay/s6-rc.d/init-migrations/run rename to root/etc/s6-overlay/s6-rc.d/init-migrations/run diff --git a/root/s6-overlay/s6-rc.d/init-migrations/type b/root/etc/s6-overlay/s6-rc.d/init-migrations/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-migrations/type rename to root/etc/s6-overlay/s6-rc.d/init-migrations/type diff --git a/root/s6-overlay/s6-rc.d/init-migrations/up b/root/etc/s6-overlay/s6-rc.d/init-migrations/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-migrations/up rename to root/etc/s6-overlay/s6-rc.d/init-migrations/up diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/type b/root/etc/s6-overlay/s6-rc.d/init-mods-end/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-end/type rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/type diff --git a/root/s6-overlay/s6-rc.d/init-mods-end/up b/root/etc/s6-overlay/s6-rc.d/init-mods-end/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-end/up rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/up diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/type b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-package-install/type rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type diff --git a/root/s6-overlay/s6-rc.d/init-mods-package-install/up b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods-package-install/up rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end rename to root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/init-config-end diff --git a/root/s6-overlay/s6-rc.d/init-mods/type b/root/etc/s6-overlay/s6-rc.d/init-mods/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods/type rename to root/etc/s6-overlay/s6-rc.d/init-mods/type diff --git a/root/s6-overlay/s6-rc.d/init-mods/up b/root/etc/s6-overlay/s6-rc.d/init-mods/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-mods/up rename to root/etc/s6-overlay/s6-rc.d/init-mods/up diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-adduser diff --git a/root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms similarity index 100% rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile rename to root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-envfile diff --git a/root/s6-overlay/s6-rc.d/init-os-end/type b/root/etc/s6-overlay/s6-rc.d/init-os-end/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-os-end/type rename to root/etc/s6-overlay/s6-rc.d/init-os-end/type diff --git a/root/s6-overlay/s6-rc.d/init-os-end/up b/root/etc/s6-overlay/s6-rc.d/init-os-end/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-os-end/up rename to root/etc/s6-overlay/s6-rc.d/init-os-end/up diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files rename to root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files diff --git a/root/s6-overlay/s6-rc.d/init-services/type b/root/etc/s6-overlay/s6-rc.d/init-services/type similarity index 100% rename from root/s6-overlay/s6-rc.d/init-services/type rename to root/etc/s6-overlay/s6-rc.d/init-services/type diff --git a/root/s6-overlay/s6-rc.d/init-services/up b/root/etc/s6-overlay/s6-rc.d/init-services/up similarity index 100% rename from root/s6-overlay/s6-rc.d/init-services/up rename to root/etc/s6-overlay/s6-rc.d/init-services/up diff --git a/root/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services similarity index 100% rename from root/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services rename to root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services diff --git a/root/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run similarity index 100% rename from root/s6-overlay/s6-rc.d/svc-cron/run rename to root/etc/s6-overlay/s6-rc.d/svc-cron/run diff --git a/root/s6-overlay/s6-rc.d/svc-cron/type b/root/etc/s6-overlay/s6-rc.d/svc-cron/type similarity index 100% rename from root/s6-overlay/s6-rc.d/svc-cron/type rename to root/etc/s6-overlay/s6-rc.d/svc-cron/type diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-adduser rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-adduser diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-config rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-config-end rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-config-end diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-custom-files rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-custom-files diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-device-perms rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-envfile b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-envfile rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-envfile diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-migrations b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-migrations rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-migrations diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods-end rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install diff --git a/root/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 similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-os-end rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-os-end diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/init-services b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/init-services rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services diff --git a/root/s6-overlay/s6-rc.d/user/contents.d/svc-cron b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron similarity index 100% rename from root/s6-overlay/s6-rc.d/user/contents.d/svc-cron rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron diff --git a/root/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check b/root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check similarity index 100% rename from root/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check rename to root/etc/s6-overlay/s6-rc.d/user2/contents.d/ci-service-check