From c90eb28817db10eabfa6b1d197be7c267eb91ec6 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 18 Apr 2022 18:04:33 +0100
Subject: [PATCH] Use Alpine 3.15 for rootfs stage

---
 Dockerfile         | 150 +++++++++++++++++++++---------------------
 Dockerfile.aarch64 | 160 ++++++++++++++++++++++-----------------------
 Dockerfile.armhf   | 158 ++++++++++++++++++++++----------------------
 3 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b1542c5..073e1ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,25 @@
-FROM alpine:3.11 as rootfs-stage
+FROM alpine:3.15 as rootfs-stage
 
 # environment
 ENV REL=focal
 ENV ARCH=amd64
 # install packages
 RUN \
- apk add --no-cache \
-        bash \
-        curl \
-        tzdata \
-        xz
+  apk add --no-cache \
+    bash \
+    curl \
+    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
 
 # Runtime stage
 FROM scratch
@@ -49,68 +49,68 @@ 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 && \
+  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/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 578e6d3..69860ae 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,25 +1,25 @@
-FROM alpine:3.11 as rootfs-stage
+FROM alpine:3.15 as rootfs-stage
 
 # environment
 ENV REL=focal
 ENV ARCH=arm64
 # install packages
 RUN \
- apk add --no-cache \
-        bash \
-        curl \
-        tzdata \
-        xz
+  apk add --no-cache \
+    bash \
+    curl \
+    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
 
 # Runtime stage
 FROM scratch
@@ -49,73 +49,73 @@ TERM="xterm"
 COPY sources.list.arm /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 && \
+  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/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b71a072..b02a3f0 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,25 +1,25 @@
-FROM alpine:3.11 as rootfs-stage
+FROM alpine:3.15 as rootfs-stage
 
 # environment
 ENV REL=focal
 ENV ARCH=armhf
 # install packages
 RUN \
- apk add --no-cache \
-        bash \
-        curl \
-        tzdata \
-        xz
+  apk add --no-cache \
+    bash \
+    curl \
+    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
 
 # Runtime stage
 FROM scratch
@@ -50,72 +50,72 @@ COPY sources.list.arm /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/*
+  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/*
 
 # add local files
 COPY root/ /