From 45f46488437473a54a3e83b53582fdca51202469 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 24 May 2022 17:56:03 +0100 Subject: [PATCH 1/7] Initial s6 v3 commit --- Dockerfile | 179 ++++++++-------- Dockerfile.aarch64 | 191 ++++++++++-------- Dockerfile.armhf | 191 ++++++++++-------- patch/etc/s6/init/init-stage2.patch | 15 -- .../etc/s6-linux-init/skel/rc.init.patch | 11 + root/docker-mods | 12 ++ root/etc/cont-init.d/01-envfile | 0 root/etc/cont-init.d/02-tamper-check | 0 root/etc/cont-init.d/10-adduser | 0 root/etc/cont-init.d/90-custom-folders | 0 root/etc/cont-init.d/99-custom-scripts | 0 root/usr/bin/with-contenv | 4 +- 12 files changed, 325 insertions(+), 278 deletions(-) delete mode 100644 patch/etc/s6/init/init-stage2.patch create mode 100644 patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch mode change 100644 => 100755 root/etc/cont-init.d/01-envfile mode change 100644 => 100755 root/etc/cont-init.d/02-tamper-check mode change 100644 => 100755 root/etc/cont-init.d/10-adduser mode change 100644 => 100755 root/etc/cont-init.d/90-custom-folders mode change 100644 => 100755 root/etc/cont-init.d/99-custom-scripts diff --git a/Dockerfile b/Dockerfile index 82c8295..8951487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,23 +3,46 @@ FROM alpine:3.15 as rootfs-stage # environment ENV REL=jammy ENV ARCH=amd64 + # install packages RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz + apk add --no-cache \ + bash \ + curl \ + patch \ + tar \ + tzdata \ + xz # grab base tarball RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out + mkdir /root-out && \ + curl -o \ + /rootfs.tar.gz -L \ + https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ + tar xf \ + /rootfs.tar.gz -C \ + /root-out + +# set version for s6 overlay +ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_ARCH="x86_64" + +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${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${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp +RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz + +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +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 + +# 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 @@ -29,15 +52,6 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" -# set version for s6 overlay -ARG OVERLAY_VERSION="v2.2.0.3" -ARG OVERLAY_ARCH="amd64" - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/ -RUN chmod +x /tmp/s6-overlay-${OVERLAY_ARCH}-installer && /tmp/s6-overlay-${OVERLAY_ARCH}-installer / && rm /tmp/s6-overlay-${OVERLAY_ARCH}-installer -COPY patch/ /tmp/patch - # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ @@ -49,68 +63,67 @@ TERM="xterm" COPY sources.list /etc/apt/ RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - set -xe && \ - 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 ****" && \ - apt-get update && \ - apt-get install -y \ - apt-utils \ - locales && \ - echo "**** install packages ****" && \ - apt-get install -y \ - curl \ - gnupg \ - patch \ - tzdata && \ - echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ - echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /app \ - /config \ - /defaults && \ - mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ - patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ - echo "**** cleanup ****" && \ - apt-get remove -y patch && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** Ripped from Ubuntu Docker Logic ****" && \ + set -xe && \ + 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 ****" && \ + apt-get update && \ + apt-get install -y \ + apt-utils \ + locales && \ + echo "**** install packages ****" && \ + apt-get install -y \ + curl \ + gnupg \ + patch \ + tzdata && \ + echo "**** generate locale ****" && \ + locale-gen en_US.UTF-8 && \ + echo "**** create abc user and make our folders ****" && \ + useradd -u 911 -U -d /config -s /bin/false abc && \ + usermod -G users abc && \ + mkdir -p \ + /app \ + /config \ + /defaults && \ + echo "**** cleanup ****" && \ + apt-get remove -y patch && \ + apt-get autoremove && \ + apt-get clean && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ad01206..4a82c91 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,23 +3,46 @@ FROM alpine:3.15 as rootfs-stage # environment ENV REL=jammy ENV ARCH=arm64 + # install packages RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz + apk add --no-cache \ + bash \ + curl \ + patch \ + tar \ + tzdata \ + xz # grab base tarball RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out + mkdir /root-out && \ + curl -o \ + /rootfs.tar.gz -L \ + https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ + tar xf \ + /rootfs.tar.gz -C \ + /root-out + +# set version for s6 overlay +ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_ARCH="aarch64" + +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${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${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp +RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz + +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +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 + +# 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 @@ -29,15 +52,6 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" -# set version for s6 overlay -ARG OVERLAY_VERSION="v2.2.0.3" -ARG OVERLAY_ARCH="aarch64" - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/ -RUN chmod +x /tmp/s6-overlay-${OVERLAY_ARCH}-installer && /tmp/s6-overlay-${OVERLAY_ARCH}-installer / && rm /tmp/s6-overlay-${OVERLAY_ARCH}-installer -COPY patch/ /tmp/patch - # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ @@ -46,76 +60,75 @@ LANG="en_US.UTF-8" \ TERM="xterm" # copy sources -COPY sources.list.arm /etc/apt/ +COPY sources.list /etc/apt/ RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - set -xe && \ - 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 ****" && \ - apt-get update && \ - apt-get install -y \ - apt-utils \ - locales && \ - echo "**** install packages ****" && \ - apt-get install -y \ - curl \ - gnupg \ - patch \ - tzdata && \ - echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ - echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /app \ - /config \ - /defaults && \ - mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ - patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ - echo "**** add qemu ****" && \ - curl -o \ - /usr/bin/qemu-aarch64-static -L \ - "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ - chmod +x /usr/bin/qemu-aarch64-static && \ - echo "**** cleanup ****" && \ - apt-get remove -y patch && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** Ripped from Ubuntu Docker Logic ****" && \ + set -xe && \ + 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 ****" && \ + apt-get update && \ + apt-get install -y \ + apt-utils \ + locales && \ + echo "**** install packages ****" && \ + apt-get install -y \ + curl \ + gnupg \ + patch \ + tzdata && \ + echo "**** generate locale ****" && \ + locale-gen en_US.UTF-8 && \ + echo "**** create abc user and make our folders ****" && \ + useradd -u 911 -U -d /config -s /bin/false abc && \ + usermod -G users abc && \ + mkdir -p \ + /app \ + /config \ + /defaults && \ + echo "**** add qemu ****" && \ + curl -o \ + /usr/bin/qemu-aarch64-static -L \ + "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ + chmod +x /usr/bin/qemu-aarch64-static && \ + echo "**** cleanup ****" && \ + apt-get remove -y patch && \ + apt-get autoremove && \ + apt-get clean && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 432c3ea..350ba0c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -3,23 +3,46 @@ FROM alpine:3.15 as rootfs-stage # environment ENV REL=jammy ENV ARCH=armhf + # install packages RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz + apk add --no-cache \ + bash \ + curl \ + patch \ + tar \ + tzdata \ + xz # grab base tarball RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out + mkdir /root-out && \ + curl -o \ + /rootfs.tar.gz -L \ + https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ + tar xf \ + /rootfs.tar.gz -C \ + /root-out + +# set version for s6 overlay +ARG S6_OVERLAY_VERSION="3.1.0.1" +ARG S6_OVERLAY_ARCH="armhf" + +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${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${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp +RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz + +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +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 + +# 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 @@ -29,15 +52,6 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" -# set version for s6 overlay -ARG OVERLAY_VERSION="v2.2.0.3" -ARG OVERLAY_ARCH="arm" - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/ -RUN chmod +x /tmp/s6-overlay-${OVERLAY_ARCH}-installer && /tmp/s6-overlay-${OVERLAY_ARCH}-installer / && rm /tmp/s6-overlay-${OVERLAY_ARCH}-installer -COPY patch/ /tmp/patch - # set environment variables ARG DEBIAN_FRONTEND="noninteractive" ENV HOME="/root" \ @@ -46,76 +60,75 @@ LANG="en_US.UTF-8" \ TERM="xterm" # copy sources -COPY sources.list.arm /etc/apt/ +COPY sources.list /etc/apt/ RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - set -xe && \ - 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 ****" && \ - apt-get update && \ - apt-get install -y \ - apt-utils \ - locales && \ - echo "**** install packages ****" && \ - apt-get install -y \ - curl \ - gnupg \ - patch \ - tzdata && \ - echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ - echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /app \ - /config \ - /defaults && \ - mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ - patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ - echo "**** add qemu ****" && \ - curl -o \ - /usr/bin/qemu-arm-static -L \ - "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \ - chmod +x /usr/bin/qemu-arm-static && \ - echo "**** cleanup ****" && \ - apt-get remove -y patch && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** Ripped from Ubuntu Docker Logic ****" && \ + set -xe && \ + 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 ****" && \ + apt-get update && \ + apt-get install -y \ + apt-utils \ + locales && \ + echo "**** install packages ****" && \ + apt-get install -y \ + curl \ + gnupg \ + patch \ + tzdata && \ + echo "**** generate locale ****" && \ + locale-gen en_US.UTF-8 && \ + echo "**** create abc user and make our folders ****" && \ + useradd -u 911 -U -d /config -s /bin/false abc && \ + usermod -G users abc && \ + mkdir -p \ + /app \ + /config \ + /defaults && \ + echo "**** add qemu ****" && \ + curl -o \ + /usr/bin/qemu-arm-static -L \ + "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \ + chmod +x /usr/bin/qemu-arm-static && \ + echo "**** cleanup ****" && \ + apt-get remove -y patch && \ + apt-get autoremove && \ + apt-get clean && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /var/log/* # add local files COPY root/ / diff --git a/patch/etc/s6/init/init-stage2.patch b/patch/etc/s6/init/init-stage2.patch deleted file mode 100644 index db176f8..0000000 --- a/patch/etc/s6/init/init-stage2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- init-stage2 2021-01-20 20:21:41.628300700 -0600 -+++ init-stage2_new 2021-01-20 20:23:48.123677700 -0600 -@@ -17,6 +17,12 @@ - backtick -D 0 -n S6_READ_ONLY_ROOT { printcontenv S6_READ_ONLY_ROOT } - importas -u S6_READ_ONLY_ROOT S6_READ_ONLY_ROOT - -+# Docker Mods run logic -+foreground -+{ -+ /docker-mods -+} -+ - foreground - { - if 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 new file mode 100644 index 0000000..b01a7f0 --- /dev/null +++ b/patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch @@ -0,0 +1,11 @@ +--- 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 index 9bd9231..732f167 100755 --- a/root/docker-mods +++ b/root/docker-mods @@ -1,5 +1,14 @@ #!/usr/bin/with-contenv 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 +} +set_legacy_executable_bits + # Exit if mods is not set if [ -z ${DOCKER_MODS+x} ]; then exit 0 @@ -119,3 +128,6 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do echo ${SHALAYER} > "/${FILENAME}" fi done + +# Set executable bit on cont-init and services that may have been 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 old mode 100644 new mode 100755 diff --git a/root/etc/cont-init.d/02-tamper-check b/root/etc/cont-init.d/02-tamper-check old mode 100644 new mode 100755 diff --git a/root/etc/cont-init.d/10-adduser b/root/etc/cont-init.d/10-adduser old mode 100644 new mode 100755 diff --git a/root/etc/cont-init.d/90-custom-folders b/root/etc/cont-init.d/90-custom-folders old mode 100644 new mode 100755 diff --git a/root/etc/cont-init.d/99-custom-scripts b/root/etc/cont-init.d/99-custom-scripts old mode 100644 new mode 100755 diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv index b535def..e26f8f4 100755 --- a/root/usr/bin/with-contenv +++ b/root/usr/bin/with-contenv @@ -1,7 +1,7 @@ #! /bin/bash if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then umask $(cat /var/run/s6/container_environment/UMASK) - exec /usr/bin/with-contenvb "$@" + exec /command/with-contenv "$@" else - exec /usr/bin/with-contenvb "$@" + exec /command/with-contenv "$@" fi From f6f7c9edab7a8eaf11183bea8249ee4aa687f6aa Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 24 May 2022 18:42:42 +0100 Subject: [PATCH 2/7] Copy arm sources for arm builds --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4a82c91..52bec93 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,7 +60,7 @@ LANG="en_US.UTF-8" \ TERM="xterm" # copy sources -COPY sources.list /etc/apt/ +COPY sources.list.arm /etc/apt/ RUN \ echo "**** Ripped from Ubuntu Docker Logic ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 350ba0c..3b54adc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -60,7 +60,7 @@ LANG="en_US.UTF-8" \ TERM="xterm" # copy sources -COPY sources.list /etc/apt/ +COPY sources.list.arm /etc/apt/ RUN \ echo "**** Ripped from Ubuntu Docker Logic ****" && \ From d8b1237a5d86810a4834d12c6f5a566cb34d1a2c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 26 May 2022 20:11:18 +0100 Subject: [PATCH 3/7] Add CI check --- Dockerfile | 3 +++ Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ ci-check/99-ci-service-check | 0 .../s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base | 0 .../s6-rc.d/99-ci-service-check/dependencies.d/legacy-services | 0 .../s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user | 0 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type | 1 + root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up | 1 + 9 files changed, 11 insertions(+) create mode 100644 ci-check/99-ci-service-check create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type create mode 100644 root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up diff --git a/Dockerfile b/Dockerfile index 8951487..2bed43d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,9 @@ 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 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 52bec93..c73127c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -40,6 +40,9 @@ 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 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3b54adc..a56a523 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -40,6 +40,9 @@ 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 diff --git a/ci-check/99-ci-service-check b/ci-check/99-ci-service-check new file mode 100644 index 0000000..e69de29 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/99-ci-service-check/dependencies.d/base new file mode 100644 index 0000000..e69de29 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/99-ci-service-check/dependencies.d/legacy-services new file mode 100644 index 0000000..e69de29 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/99-ci-service-check/dependencies.d/user new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up new file mode 100644 index 0000000..06ccdf9 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up @@ -0,0 +1 @@ +echo "[services.d] done." \ No newline at end of file From 3a7fc5e14d6a99b3b569279ba672ffea5f20ff85 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 27 May 2022 14:29:54 +0100 Subject: [PATCH 4/7] Update CI init message --- root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up index 06ccdf9..e0f9488 100644 --- a/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up +++ b/root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up @@ -1 +1 @@ -echo "[services.d] done." \ No newline at end of file +echo "[ls.io-init] done." \ No newline at end of file From b65cc90d9f36ef74bc17b982c341941fed01e78a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 27 May 2022 14:31:46 +0100 Subject: [PATCH 5/7] Remove patch package from runtime as it's done in rootfs now --- Dockerfile | 2 -- Dockerfile.aarch64 | 2 -- Dockerfile.armhf | 2 -- 3 files changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bed43d..1274276 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,7 +107,6 @@ RUN \ apt-get install -y \ curl \ gnupg \ - patch \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -119,7 +118,6 @@ RUN \ /config \ /defaults && \ echo "**** cleanup ****" && \ - apt-get remove -y patch && \ apt-get autoremove && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c73127c..cadd9b6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -107,7 +107,6 @@ RUN \ apt-get install -y \ curl \ gnupg \ - patch \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -124,7 +123,6 @@ RUN \ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ chmod +x /usr/bin/qemu-aarch64-static && \ echo "**** cleanup ****" && \ - apt-get remove -y patch && \ apt-get autoremove && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a56a523..4ca39b3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -107,7 +107,6 @@ RUN \ apt-get install -y \ curl \ gnupg \ - patch \ tzdata && \ echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \ @@ -124,7 +123,6 @@ RUN \ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \ chmod +x /usr/bin/qemu-arm-static && \ echo "**** cleanup ****" && \ - apt-get remove -y patch && \ apt-get autoremove && \ apt-get clean && \ rm -rf \ From 98ebac465a2eb24c5390acd54834d11f7f9ce52d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 3 Jun 2022 14:39:20 +0100 Subject: [PATCH 6/7] Add compatibility shim for v2 scandir --- root/etc/s6-overlay/s6-rc.d/00-legacy/type | 1 + root/etc/s6-overlay/s6-rc.d/00-legacy/up | 1 + root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy | 0 3 files changed, 2 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/00-legacy/type create mode 100644 root/etc/s6-overlay/s6-rc.d/00-legacy/up create 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 new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/00-legacy/type @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..e84685c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/00-legacy/up @@ -0,0 +1 @@ +ln -s /run/s6/legacy-services /run/s6/services \ No newline at end of file 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 new file mode 100644 index 0000000..e69de29 From 3848316e27844aa0c25f16c2923b92d1f7ac30a4 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 3 Jun 2022 17:33:02 +0100 Subject: [PATCH 7/7] Trailing newline --- root/etc/s6-overlay/s6-rc.d/00-legacy/up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/00-legacy/up b/root/etc/s6-overlay/s6-rc.d/00-legacy/up index e84685c..4aa1c27 100644 --- a/root/etc/s6-overlay/s6-rc.d/00-legacy/up +++ b/root/etc/s6-overlay/s6-rc.d/00-legacy/up @@ -1 +1 @@ -ln -s /run/s6/legacy-services /run/s6/services \ No newline at end of file +ln -s /run/s6/legacy-services /run/s6/services