Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ubuntu-toolbox version 24.10, removed 23.10 (eol) #1565

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −12
Open

Added ubuntu-toolbox version 24.10, removed 23.10 (eol) #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-images.yaml
View file
Open in desktop
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
17 changes: 6 additions & 11 deletions images/ubuntu/23.10/Containerfile → images/ubuntu/24.10/Containerfile
View file
Open in desktop
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]>"
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
Comment on lines -14 to -18
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this as libnss-myhostname now does the actual configuration for us.


# 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
0 images/ubuntu/23.10/extra-packages → images/ubuntu/24.10/extra-packages
View file
Open in desktop
File renamed without changes.