From 61ca0f2f5606401dc110e834cb71acab9680ad5b Mon Sep 17 00:00:00 2001
From: David Scholberg <recombinant.vector@gmail.com>
Date: Wed, 16 Oct 2024 22:38:46 -0400
Subject: [PATCH] added ubuntu-toolbox version 24.10

---
 images/ubuntu/24.10/Containerfile  | 47 ++++++++++++++++++++++++++++++
 images/ubuntu/24.10/extra-packages |  8 +++++
 2 files changed, 55 insertions(+)
 create mode 100644 images/ubuntu/24.10/Containerfile
 create mode 100644 images/ubuntu/24.10/extra-packages

diff --git a/images/ubuntu/24.10/Containerfile b/images/ubuntu/24.10/Containerfile
new file mode 100644
index 000000000..74fda4c2b
--- /dev/null
+++ b/images/ubuntu/24.10/Containerfile
@@ -0,0 +1,47 @@
+FROM docker.io/library/ubuntu:24.10
+
+LABEL com.github.containers.toolbox="true" \
+      name="ubuntu-toolbox" \
+      version="24.10" \
+      usage="This image is meant to be used with the toolbox command" \
+      summary="Base image for creating Ubuntu Toolbx containers" \
+      maintainer="Ievgen Popovych <jmennius@gmail.com>"
+
+# 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 apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install unminimize && \
+    sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/bin/unminimize && \
+    yes | /usr/bin/unminimize && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install \
+        ubuntu-minimal ubuntu-standard \
+        libnss-myhostname \
+        flatpak-xdg-utils \
+        $(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/
+
+# Having anything in /home prevents toolbox from symlinking /var/home there,
+# and 'ubuntu' user with UID 1000 will most likely conflict with host user as well
+RUN userdel --remove ubuntu
+
+# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
+RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf
diff --git a/images/ubuntu/24.10/extra-packages b/images/ubuntu/24.10/extra-packages
new file mode 100644
index 000000000..5e917e85e
--- /dev/null
+++ b/images/ubuntu/24.10/extra-packages
@@ -0,0 +1,8 @@
+curl
+git
+gnupg2
+keyutils
+tree
+unzip
+zip
+zsh