From f4531811231434d91382fea1bab96c7c849c15aa Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Wed, 23 Jun 2021 06:07:16 +0000
Subject: [PATCH] fix: Move sources.list acquisition and decision to fetcher
---
Dockerfile | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 171d8db..234d6d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,9 @@ RUN \
xz
RUN \
- mkdir /focal-rootfs && \
+ mkdir \
+ /focal-rootfs \
+ /tmp && \
curl -o \
/focal-rootfs.tar.gz -L \
https://partner-images.canonical.com/core/focal/${FOCAL_RELEASE_DATE}/ubuntu-focal-core-cloudimg-${FOCAL_ARCH}-root.tar.gz && \
@@ -20,10 +22,25 @@ RUN \
/focal-rootfs.tar.gz -C \
/focal-rootfs
+COPY sources.list /tmp/
+COPY sources.list.arm /tmp/
+
+RUN \
+ if [ $FOCAL_ARCH="amd64" ];then
+ rm /tmp/sources.list.arm
+ else
+ rm /tmp/sources.list
+ mv \
+ /tmp/sources.list.arm \
+ /tmp/sources.list
+ fi
+
FROM scratch
COPY --from=fetcher /focal-rootfs/ /
+COPY --from=fetcher /tmp/sources.list /etc/apt/
+
ARG BUILD_DATE="PassMeTheDateMate"
ARG VERSION="ChangeMe"
LABEL build_version="Git.Griefed.de version:- ${VERSION} Build-date:- ${BUILD_DATE}"
@@ -36,9 +53,10 @@ them perfect for learning."
# s6, s6 version and s6 architecture
ARG OVERLAY_ARCH="amd64"
ARG OVERLAY_VERSION="v2.2.0.3"
+
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"
@@ -47,17 +65,6 @@ ENV LANGUAGE="en_US.UTF-8"
ENV LANG="en_US.UTF-8"
ENV TERM="xterm"
-# copy sources
-COPY sources.list /etc/apt/
-COPY sources.list.arm /etc/apt
-
-RUN \
- if [ $OVERLAY_ARCH="amd64" ];then
- rm /etc/apt/sources.list.arm
- else
- rm /etc/apt/sources.list
- fi
-
RUN \
echo "**** Ripped from Ubuntu Docker Logic ****" && \
set -xe && \
--
GitLab