mirror
/
docker-baseimage-ubuntu
kopia lustrzana https://github.com/linuxserver/docker-baseimage-ubuntu
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #92 from linuxserver/s6-3.1.0.1-jammy

pull/94/head jammy-ce979931-ls23
Adam 2022-06-06 14:42:40 +01:00 zatwierdzone przez GitHub
rodzic d277d8914b 3848316e27
commit f2a45dda92
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
21 zmienionych plików z 330 dodań i 276 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

180
Dockerfile
Wyświetl plik

@ -3,23 +3,49 @@ FROM alpine:3.15 as rootfs-stage
# environment # environment
ENV REL=jammy ENV REL=jammy
ENV ARCH=amd64 ENV ARCH=amd64
# install packages # install packages
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
curl \ curl \
tzdata \ patch \
xz tar \
tzdata \
xz
# grab base tarball # grab base tarball
RUN \ RUN \
mkdir /root-out && \ mkdir /root-out && \
curl -o \ curl -o \
/rootfs.tar.gz -L \ /rootfs.tar.gz -L \
https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
tar xf \ tar xf \
/rootfs.tar.gz -C \ /rootfs.tar.gz -C \
/root-out /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
# 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 # Runtime stage
FROM scratch FROM scratch
@ -29,15 +55,6 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" 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 # set environment variables
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"
ENV HOME="/root" \ ENV HOME="/root" \
@ -49,68 +66,65 @@ TERM="xterm"
COPY sources.list /etc/apt/ COPY sources.list /etc/apt/
RUN \ RUN \
echo "**** Ripped from Ubuntu Docker Logic ****" && \ echo "**** Ripped from Ubuntu Docker Logic ****" && \
set -xe && \ set -xe && \
echo '#!/bin/sh' \ echo '#!/bin/sh' \
> /usr/sbin/policy-rc.d && \ > /usr/sbin/policy-rc.d && \
echo 'exit 101' \ echo 'exit 101' \
>> /usr/sbin/policy-rc.d && \ >> /usr/sbin/policy-rc.d && \
chmod +x \ chmod +x \
/usr/sbin/policy-rc.d && \ /usr/sbin/policy-rc.d && \
dpkg-divert --local --rename --add /sbin/initctl && \ dpkg-divert --local --rename --add /sbin/initctl && \
cp -a \ cp -a \
/usr/sbin/policy-rc.d \ /usr/sbin/policy-rc.d \
/sbin/initctl && \ /sbin/initctl && \
sed -i \ sed -i \
's/^exit.*/exit 0/' \ 's/^exit.*/exit 0/' \
/sbin/initctl && \ /sbin/initctl && \
echo 'force-unsafe-io' \ echo 'force-unsafe-io' \
> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ > /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"; };' \ 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 && \ > /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"; };' \ 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 && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
>> /etc/apt/apt.conf.d/docker-clean && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Acquire::Languages "none";' \ echo 'Acquire::Languages "none";' \
> /etc/apt/apt.conf.d/docker-no-languages && \ > /etc/apt/apt.conf.d/docker-no-languages && \
echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
> /etc/apt/apt.conf.d/docker-gzip-indexes && \ > /etc/apt/apt.conf.d/docker-gzip-indexes && \
echo 'Apt::AutoRemove::SuggestsImportant "false";' \ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
> /etc/apt/apt.conf.d/docker-autoremove-suggests && \ > /etc/apt/apt.conf.d/docker-autoremove-suggests && \
mkdir -p /run/systemd && \ mkdir -p /run/systemd && \
echo 'docker' \ echo 'docker' \
> /run/systemd/container && \ > /run/systemd/container && \
echo "**** install apt-utils and locales ****" && \ echo "**** install apt-utils and locales ****" && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
apt-utils \ apt-utils \
locales && \ locales && \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get install -y \ apt-get install -y \
curl \ curl \
gnupg \ gnupg \
patch \ tzdata && \
tzdata && \ echo "**** generate locale ****" && \
echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \
locale-gen en_US.UTF-8 && \ echo "**** create abc user and make our folders ****" && \
echo "**** create abc user and make our folders ****" && \ useradd -u 911 -U -d /config -s /bin/false abc && \
useradd -u 911 -U -d /config -s /bin/false abc && \ usermod -G users abc && \
usermod -G users abc && \ mkdir -p \
mkdir -p \ /app \
/app \ /config \
/config \ /defaults && \
/defaults && \ echo "**** cleanup ****" && \
mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ apt-get autoremove && \
patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ apt-get clean && \
echo "**** cleanup ****" && \ rm -rf \
apt-get remove -y patch && \ /tmp/* \
apt-get autoremove && \ /var/lib/apt/lists/* \
apt-get clean && \ /var/tmp/* \
rm -rf \ /var/log/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files # add local files
COPY root/ / COPY root/ /

190
Dockerfile.aarch64
Wyświetl plik

@ -3,23 +3,49 @@ FROM alpine:3.15 as rootfs-stage
# environment # environment
ENV REL=jammy ENV REL=jammy
ENV ARCH=arm64 ENV ARCH=arm64
# install packages # install packages
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
curl \ curl \
tzdata \ patch \
xz tar \
tzdata \
xz
# grab base tarball # grab base tarball
RUN \ RUN \
mkdir /root-out && \ mkdir /root-out && \
curl -o \ curl -o \
/rootfs.tar.gz -L \ /rootfs.tar.gz -L \
https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
tar xf \ tar xf \
/rootfs.tar.gz -C \ /rootfs.tar.gz -C \
/root-out /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
# 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 # Runtime stage
FROM scratch FROM scratch
@ -29,15 +55,6 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" 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 # set environment variables
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"
ENV HOME="/root" \ ENV HOME="/root" \
@ -49,73 +66,70 @@ TERM="xterm"
COPY sources.list.arm /etc/apt/ COPY sources.list.arm /etc/apt/
RUN \ RUN \
echo "**** Ripped from Ubuntu Docker Logic ****" && \ echo "**** Ripped from Ubuntu Docker Logic ****" && \
set -xe && \ set -xe && \
echo '#!/bin/sh' \ echo '#!/bin/sh' \
> /usr/sbin/policy-rc.d && \ > /usr/sbin/policy-rc.d && \
echo 'exit 101' \ echo 'exit 101' \
>> /usr/sbin/policy-rc.d && \ >> /usr/sbin/policy-rc.d && \
chmod +x \ chmod +x \
/usr/sbin/policy-rc.d && \ /usr/sbin/policy-rc.d && \
dpkg-divert --local --rename --add /sbin/initctl && \ dpkg-divert --local --rename --add /sbin/initctl && \
cp -a \ cp -a \
/usr/sbin/policy-rc.d \ /usr/sbin/policy-rc.d \
/sbin/initctl && \ /sbin/initctl && \
sed -i \ sed -i \
's/^exit.*/exit 0/' \ 's/^exit.*/exit 0/' \
/sbin/initctl && \ /sbin/initctl && \
echo 'force-unsafe-io' \ echo 'force-unsafe-io' \
> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ > /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"; };' \ 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 && \ > /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"; };' \ 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 && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
>> /etc/apt/apt.conf.d/docker-clean && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Acquire::Languages "none";' \ echo 'Acquire::Languages "none";' \
> /etc/apt/apt.conf.d/docker-no-languages && \ > /etc/apt/apt.conf.d/docker-no-languages && \
echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
> /etc/apt/apt.conf.d/docker-gzip-indexes && \ > /etc/apt/apt.conf.d/docker-gzip-indexes && \
echo 'Apt::AutoRemove::SuggestsImportant "false";' \ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
> /etc/apt/apt.conf.d/docker-autoremove-suggests && \ > /etc/apt/apt.conf.d/docker-autoremove-suggests && \
mkdir -p /run/systemd && \ mkdir -p /run/systemd && \
echo 'docker' \ echo 'docker' \
> /run/systemd/container && \ > /run/systemd/container && \
echo "**** install apt-utils and locales ****" && \ echo "**** install apt-utils and locales ****" && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
apt-utils \ apt-utils \
locales && \ locales && \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get install -y \ apt-get install -y \
curl \ curl \
gnupg \ gnupg \
patch \ tzdata && \
tzdata && \ echo "**** generate locale ****" && \
echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \
locale-gen en_US.UTF-8 && \ echo "**** create abc user and make our folders ****" && \
echo "**** create abc user and make our folders ****" && \ useradd -u 911 -U -d /config -s /bin/false abc && \
useradd -u 911 -U -d /config -s /bin/false abc && \ usermod -G users abc && \
usermod -G users abc && \ mkdir -p \
mkdir -p \ /app \
/app \ /config \
/config \ /defaults && \
/defaults && \ echo "**** add qemu ****" && \
mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ curl -o \
patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ /usr/bin/qemu-aarch64-static -L \
echo "**** add qemu ****" && \ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
curl -o \ chmod +x /usr/bin/qemu-aarch64-static && \
/usr/bin/qemu-aarch64-static -L \ echo "**** cleanup ****" && \
"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ apt-get autoremove && \
chmod +x /usr/bin/qemu-aarch64-static && \ apt-get clean && \
echo "**** cleanup ****" && \ rm -rf \
apt-get remove -y patch && \ /tmp/* \
apt-get autoremove && \ /var/lib/apt/lists/* \
apt-get clean && \ /var/tmp/* \
rm -rf \ /var/log/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files # add local files
COPY root/ / COPY root/ /

190
Dockerfile.armhf
Wyświetl plik

@ -3,23 +3,49 @@ FROM alpine:3.15 as rootfs-stage
# environment # environment
ENV REL=jammy ENV REL=jammy
ENV ARCH=armhf ENV ARCH=armhf
# install packages # install packages
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
curl \ curl \
tzdata \ patch \
xz tar \
tzdata \
xz
# grab base tarball # grab base tarball
RUN \ RUN \
mkdir /root-out && \ mkdir /root-out && \
curl -o \ curl -o \
/rootfs.tar.gz -L \ /rootfs.tar.gz -L \
https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
tar xf \ tar xf \
/rootfs.tar.gz -C \ /rootfs.tar.gz -C \
/root-out /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
# 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 # Runtime stage
FROM scratch FROM scratch
@ -29,15 +55,6 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" 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 # set environment variables
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"
ENV HOME="/root" \ ENV HOME="/root" \
@ -49,73 +66,70 @@ TERM="xterm"
COPY sources.list.arm /etc/apt/ COPY sources.list.arm /etc/apt/
RUN \ RUN \
echo "**** Ripped from Ubuntu Docker Logic ****" && \ echo "**** Ripped from Ubuntu Docker Logic ****" && \
set -xe && \ set -xe && \
echo '#!/bin/sh' \ echo '#!/bin/sh' \
> /usr/sbin/policy-rc.d && \ > /usr/sbin/policy-rc.d && \
echo 'exit 101' \ echo 'exit 101' \
>> /usr/sbin/policy-rc.d && \ >> /usr/sbin/policy-rc.d && \
chmod +x \ chmod +x \
/usr/sbin/policy-rc.d && \ /usr/sbin/policy-rc.d && \
dpkg-divert --local --rename --add /sbin/initctl && \ dpkg-divert --local --rename --add /sbin/initctl && \
cp -a \ cp -a \
/usr/sbin/policy-rc.d \ /usr/sbin/policy-rc.d \
/sbin/initctl && \ /sbin/initctl && \
sed -i \ sed -i \
's/^exit.*/exit 0/' \ 's/^exit.*/exit 0/' \
/sbin/initctl && \ /sbin/initctl && \
echo 'force-unsafe-io' \ echo 'force-unsafe-io' \
> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ > /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"; };' \ 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 && \ > /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"; };' \ 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 && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
>> /etc/apt/apt.conf.d/docker-clean && \ >> /etc/apt/apt.conf.d/docker-clean && \
echo 'Acquire::Languages "none";' \ echo 'Acquire::Languages "none";' \
> /etc/apt/apt.conf.d/docker-no-languages && \ > /etc/apt/apt.conf.d/docker-no-languages && \
echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
> /etc/apt/apt.conf.d/docker-gzip-indexes && \ > /etc/apt/apt.conf.d/docker-gzip-indexes && \
echo 'Apt::AutoRemove::SuggestsImportant "false";' \ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
> /etc/apt/apt.conf.d/docker-autoremove-suggests && \ > /etc/apt/apt.conf.d/docker-autoremove-suggests && \
mkdir -p /run/systemd && \ mkdir -p /run/systemd && \
echo 'docker' \ echo 'docker' \
> /run/systemd/container && \ > /run/systemd/container && \
echo "**** install apt-utils and locales ****" && \ echo "**** install apt-utils and locales ****" && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
apt-utils \ apt-utils \
locales && \ locales && \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get install -y \ apt-get install -y \
curl \ curl \
gnupg \ gnupg \
patch \ tzdata && \
tzdata && \ echo "**** generate locale ****" && \
echo "**** generate locale ****" && \ locale-gen en_US.UTF-8 && \
locale-gen en_US.UTF-8 && \ echo "**** create abc user and make our folders ****" && \
echo "**** create abc user and make our folders ****" && \ useradd -u 911 -U -d /config -s /bin/false abc && \
useradd -u 911 -U -d /config -s /bin/false abc && \ usermod -G users abc && \
usermod -G users abc && \ mkdir -p \
mkdir -p \ /app \
/app \ /config \
/config \ /defaults && \
/defaults && \ echo "**** add qemu ****" && \
mv /usr/bin/with-contenv /usr/bin/with-contenvb && \ curl -o \
patch -u /etc/s6/init/init-stage2 -i /tmp/patch/etc/s6/init/init-stage2.patch && \ /usr/bin/qemu-arm-static -L \
echo "**** add qemu ****" && \ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \
curl -o \ chmod +x /usr/bin/qemu-arm-static && \
/usr/bin/qemu-arm-static -L \ echo "**** cleanup ****" && \
"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \ apt-get autoremove && \
chmod +x /usr/bin/qemu-arm-static && \ apt-get clean && \
echo "**** cleanup ****" && \ rm -rf \
apt-get remove -y patch && \ /tmp/* \
apt-get autoremove && \ /var/lib/apt/lists/* \
apt-get clean && \ /var/tmp/* \
rm -rf \ /var/log/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# add local files # add local files
COPY root/ / COPY root/ /

0
ci-check/99-ci-service-check 100644
Wyświetl plik

15
patch/etc/s6/init/init-stage2.patch
Wyświetl plik

@ -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

11
patch/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init.patch 100644
Wyświetl plik

@ -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

12
root/docker-mods
Wyświetl plik

@ -1,5 +1,14 @@
#!/usr/bin/with-contenv bash #!/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 # Exit if mods is not set
if [ -z ${DOCKER_MODS+x} ]; then if [ -z ${DOCKER_MODS+x} ]; then
exit 0 exit 0
@ -119,3 +128,6 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
echo ${SHALAYER} > "/${FILENAME}" echo ${SHALAYER} > "/${FILENAME}"
fi fi
done done
# Set executable bit on cont-init and services that may have been unpacked by mods
set_legacy_executable_bits

0
root/etc/cont-init.d/01-envfile 100644 → 100755
Wyświetl plik

0
root/etc/cont-init.d/02-tamper-check 100644 → 100755
Wyświetl plik

0
root/etc/cont-init.d/10-adduser 100644 → 100755
Wyświetl plik

0
root/etc/cont-init.d/90-custom-folders 100644 → 100755
Wyświetl plik

0
root/etc/cont-init.d/99-custom-scripts 100644 → 100755
Wyświetl plik

1
root/etc/s6-overlay/s6-rc.d/00-legacy/type 100644
Wyświetl plik

@ -0,0 +1 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/00-legacy/up 100644
Wyświetl plik

@ -0,0 +1 @@
ln -s /run/s6/legacy-services /run/s6/services

0
root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/base 100644
Wyświetl plik

0
root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/legacy-services 100644
Wyświetl plik

0
root/etc/s6-overlay/s6-rc.d/99-ci-service-check/dependencies.d/user 100644
Wyświetl plik

1
root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type 100644
Wyświetl plik

@ -0,0 +1 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/99-ci-service-check/up 100644
Wyświetl plik

@ -0,0 +1 @@
echo "[ls.io-init] done."

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/00-legacy 100644
Wyświetl plik

4
root/usr/bin/with-contenv
Wyświetl plik

@ -1,7 +1,7 @@
#! /bin/bash #! /bin/bash
if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then
umask $(cat /var/run/s6/container_environment/UMASK) umask $(cat /var/run/s6/container_environment/UMASK)
exec /usr/bin/with-contenvb "$@" exec /command/with-contenv "$@"
else else
exec /usr/bin/with-contenvb "$@" exec /command/with-contenv "$@"
fi fi