From 26f9b31e8fac1f186bb004d9d8b29edd913c15a0 Mon Sep 17 00:00:00 2001
From: Mick Pollard <5791325-aussielunix_@users.noreply.gitlab.com>
Date: Fri, 13 Oct 2023 18:44:51 +1100
Subject: [PATCH] refined Containerfile - reduced image by 50%

---
 Containerfile | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/Containerfile b/Containerfile
index be9e1f8..524d6b2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,33 +7,16 @@ LABEL com.github.containers.toolbox="true" \
       summary="Base image for creating Ubuntu toolbox containers" \
       maintainer="Mick Pollard <mick@aussielunix.io>"
 
-# Remove apt configuration optimized for containers
-# Remove docker-gzip-indexes to help with "command-not-found"
-RUN rm /etc/apt/apt.conf.d/docker-gzip-indexes /etc/apt/apt.conf.d/docker-no-languages
-
-# Enable myhostname nss plugin for clean hostname resolution without patching
-# hosts (at least for sudo), add it right after 'files' entry. We expect that
-# this entry is not present yet. Do this early so that package postinst (which
-# adds it too late in the order) skips this step
-RUN sed -Ei 's/^(hosts:.*)(\<files\>)\s*(.*)/\1\2 myhostname \3/' /etc/nsswitch.conf
-
-# Restore documentation but do not upgrade all packages
-# Install ubuntu-minimal & ubuntu-standard
 # Install extra packages as well as libnss-myhostname
 COPY extra-packages /
-RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \
-    apt-get update && \
-    yes | /usr/local/sbin/unminimize && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install \
-        ubuntu-minimal ubuntu-standard \
-        libnss-myhostname \
-        $(cat extra-packages | xargs) && \
-    rm -rd /var/lib/apt/lists/*
-RUN rm /extra-packages
 
-# Fix empty bind-mount to clear selinuxfs (see #337)
-RUN mkdir /usr/share/empty
-
-# Add flatpak-spawn to /usr/bin
-RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/
+RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize \
+    && apt-get update -yq \
+    && apt-get -yq dist-upgrade \
+    && DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+      libnss-myhostname \
+      $(cat extra-packages | xargs) \
+    && yes | /usr/local/sbin/unminimize && echo '' \
+    && apt-get clean
+RUN rm /extra-packages