-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
images: ubuntu: Add 24.10 interim, remove 23.10 (interim, EOL)
- Loading branch information
1 parent
ed14cd4
commit 86be839
Showing
3 changed files
with
7 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
FROM docker.io/library/ubuntu:23.10 | ||
FROM docker.io/library/ubuntu:24.10 | ||
|
||
LABEL com.github.containers.toolbox="true" \ | ||
name="ubuntu-toolbox" \ | ||
version="23.10" \ | ||
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 <[email protected]>" | ||
|
@@ -11,19 +11,14 @@ LABEL com.github.containers.toolbox="true" \ | |
# 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 && \ | ||
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 \ | ||
|
File renamed without changes.