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

davidscholberg · 2024-10-17T02:47:52Z

This PR adds an ubuntu-toolbox image for ubuntu 24.10 and removes version 23.10 as it has reached EOL.

I copied the files from 24.04 and made a few slight changes (obviously updated the version numbers but also had to explicitly install unminimize since it doesn't seem to be included with the image anymore). Here's everything that I changed from 24.04:

diff -urN images/ubuntu/24.04/Containerfile images/ubuntu/24.10/Containerfile
--- images/ubuntu/24.04/Containerfile   2024-10-16 21:41:33.928967339 -0400
+++ images/ubuntu/24.10/Containerfile   2024-10-16 22:09:08.875131964 -0400
@@ -1,8 +1,8 @@
-FROM docker.io/library/ubuntu:24.04
+FROM docker.io/library/ubuntu:24.10

 LABEL com.github.containers.toolbox="true" \
       name="ubuntu-toolbox" \
-      version="24.04" \
+      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]>"
@@ -21,9 +21,10 @@
 # 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 \

I'm not sure if any of the other steps in the Containerfile are out of date, but the image does work fine with toolbox from my testing of it.

softwarefactory-project-zuul · 2024-10-17T04:34:13Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/98a28194b77d40a2950acd6c911ccdc7

✔️ unit-test SUCCESS in 5m 32s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 4m 00s
✔️ unit-test-restricted SUCCESS in 5m 25s
✔️ system-test-fedora-rawhide-commands-options SUCCESS in 1h 25m 58s
✔️ system-test-fedora-rawhide-runtime-environment-arch-fedora SUCCESS in 1h 33m 29s
✔️ system-test-fedora-rawhide-runtime-environment-ubuntu SUCCESS in 39m 58s
✔️ system-test-fedora-41-commands-options SUCCESS in 1h 21m 22s
❌ system-test-fedora-41-runtime-environment TIMED_OUT in 1h 45m 25s
✔️ system-test-fedora-40-commands-options SUCCESS in 1h 27m 44s
❌ system-test-fedora-40-runtime-environment TIMED_OUT in 1h 45m 23s
✔️ system-test-fedora-39-commands-options SUCCESS in 1h 24m 24s
❌ system-test-fedora-39-runtime-environment TIMED_OUT in 1h 45m 19s

tom-reinders

Probably have to add 24.10 to https://github.com/containers/toolbox/blob/main/.github/workflows/ubuntu-images.yaml#L39

davidscholberg · 2024-10-17T20:16:02Z

@tom-reinders updated PR with 24.10 added to .github/workflows/ubuntu-images.yaml, and I also update the latest_release option in that file to 24.10.

softwarefactory-project-zuul · 2024-10-17T22:00:19Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/bd3a4553520f4b68b99eb616ede7fbc2

Jmennius · 2024-10-18T09:46:50Z

@tom-reinders updated PR with 24.10 added to .github/workflows/ubuntu-images.yaml, and I also update the latest_release option in that file to 24.10.

So the latest_release should stay with the latest LTS version.

Jmennius

And we also need to drop 23.10 as it is EOL.
This will also make the PR look like a rename of 23.10 files - easier to review :) (thanks for the explicit diff BTW)

davidscholberg · 2024-10-18T20:06:55Z

@Jmennius updated PR with revert of latest_release back to LTS, and removed 23.10 from that file, and deleted the 23.10 directory as well.

softwarefactory-project-zuul · 2024-10-18T21:50:55Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/b4331eb2e3a44480bebd9eab7d185141

✔️ unit-test SUCCESS in 5m 34s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 39s
✔️ unit-test-restricted SUCCESS in 5m 35s
✔️ system-test-fedora-rawhide-commands-options SUCCESS in 1h 23m 02s
✔️ system-test-fedora-rawhide-runtime-environment-arch-fedora SUCCESS in 1h 28m 40s
✔️ system-test-fedora-rawhide-runtime-environment-ubuntu SUCCESS in 38m 19s
✔️ system-test-fedora-41-commands-options SUCCESS in 1h 19m 07s
❌ system-test-fedora-41-runtime-environment TIMED_OUT in 1h 45m 21s
✔️ system-test-fedora-40-commands-options SUCCESS in 1h 19m 58s
❌ system-test-fedora-40-runtime-environment TIMED_OUT in 1h 45m 19s
✔️ system-test-fedora-39-commands-options SUCCESS in 1h 10m 46s
✔️ system-test-fedora-39-runtime-environment SUCCESS in 1h 40m 21s

Jmennius · 2024-10-20T20:44:14Z

images/ubuntu/24.10/Containerfile

-# 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


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

Jmennius · 2024-10-20T21:20:30Z

@davidscholberg can you add a sign-off to the commit please? (git commit --amend -s, just be sure to fetch the updated branch)

softwarefactory-project-zuul · 2024-10-20T22:29:55Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/a959b32c435d4d608d80e7c064f6092e

✔️ unit-test SUCCESS in 5m 28s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 10s
✔️ unit-test-restricted SUCCESS in 5m 25s
✔️ system-test-fedora-rawhide-commands-options SUCCESS in 1h 27m 53s
✔️ system-test-fedora-rawhide-runtime-environment-arch-fedora SUCCESS in 1h 32m 22s
✔️ system-test-fedora-rawhide-runtime-environment-ubuntu SUCCESS in 39m 56s
✔️ system-test-fedora-41-commands-options SUCCESS in 1h 24m 29s
❌ system-test-fedora-41-runtime-environment TIMED_OUT in 1h 45m 20s
✔️ system-test-fedora-40-commands-options SUCCESS in 1h 27m 13s
❌ system-test-fedora-40-runtime-environment TIMED_OUT in 1h 45m 20s
✔️ system-test-fedora-39-commands-options SUCCESS in 1h 09m 39s
✔️ system-test-fedora-39-runtime-environment SUCCESS in 1h 41m 13s

davidscholberg requested a review from Jmennius as a code owner October 17, 2024 02:47

tom-reinders suggested changes Oct 17, 2024

View reviewed changes

davidscholberg force-pushed the add-ubuntu-24.10 branch from 61ca0f2 to 7526eed Compare October 17, 2024 20:14

tom-reinders approved these changes Oct 18, 2024

View reviewed changes

Jmennius requested changes Oct 18, 2024

View reviewed changes

davidscholberg force-pushed the add-ubuntu-24.10 branch from 7526eed to f06e2f7 Compare October 18, 2024 20:04

davidscholberg changed the title ~~Added ubuntu-toolbox version 24.10~~ Added ubuntu-toolbox version 24.10, removed 23.10 (eol) Oct 18, 2024

images: ubuntu: Add 24.10 interim, remove 23.10 (interim, EOL)

86be839

Jmennius force-pushed the add-ubuntu-24.10 branch from f06e2f7 to 86be839 Compare October 20, 2024 20:43

Jmennius reviewed Oct 20, 2024

View reviewed changes

Jmennius approved these changes Oct 20, 2024

View reviewed changes

Jmennius self-assigned this Oct 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

davidscholberg commented Oct 17, 2024 •

edited

Loading

softwarefactory-project-zuul bot commented Oct 17, 2024

tom-reinders left a comment

davidscholberg commented Oct 17, 2024

softwarefactory-project-zuul bot commented Oct 17, 2024

Jmennius commented Oct 18, 2024

Jmennius left a comment

davidscholberg commented Oct 18, 2024

softwarefactory-project-zuul bot commented Oct 18, 2024

Jmennius Oct 20, 2024

Jmennius commented Oct 20, 2024

softwarefactory-project-zuul bot commented Oct 20, 2024

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

Are you sure you want to change the base?

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

Conversation

davidscholberg commented Oct 17, 2024 • edited Loading

softwarefactory-project-zuul bot commented Oct 17, 2024

tom-reinders left a comment

Choose a reason for hiding this comment

davidscholberg commented Oct 17, 2024

softwarefactory-project-zuul bot commented Oct 17, 2024

Jmennius commented Oct 18, 2024

Jmennius left a comment

Choose a reason for hiding this comment

davidscholberg commented Oct 18, 2024

softwarefactory-project-zuul bot commented Oct 18, 2024

Jmennius Oct 20, 2024

Choose a reason for hiding this comment

Jmennius commented Oct 20, 2024

softwarefactory-project-zuul bot commented Oct 20, 2024

davidscholberg commented Oct 17, 2024 •

edited

Loading