Skip to content

Commit

Permalink
images: ubuntu: Add 24.10 interim, remove 23.10 (interim, EOL)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidscholberg authored and Jmennius committed Oct 20, 2024
1 parent ed14cd4 commit 86be839
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
build-push-images:
strategy:
matrix:
release: ['16.04', '18.04', '20.04', '22.04', '23.10', '24.04']
release: ['16.04', '18.04', '20.04', '22.04', '24.04', '24.10']

runs-on: ubuntu-latest
steps:
Expand Down
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 <jmennius@gmail.com>"
Expand All @@ -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 \
Expand Down
File renamed without changes.

0 comments on commit 86be839

Please sign in to comment.