From e82c32f80ce20d55782663122921298b9527bfaa Mon Sep 17 00:00:00 2001 From: Ievgen Popovych Date: Sun, 10 Dec 2023 21:53:53 +0200 Subject: [PATCH 1/2] images: ubuntu: Add 23.10, drop 22.10 https://github.com/containers/toolbox/pull/1416 Signed-off-by: Ievgen Popovych --- .github/workflows/ubuntu-images.yaml | 2 +- images/ubuntu/{22.10 => 23.10}/Containerfile | 8 ++++++-- images/ubuntu/{22.10 => 23.10}/extra-packages | 0 3 files changed, 7 insertions(+), 3 deletions(-) rename images/ubuntu/{22.10 => 23.10}/Containerfile (87%) rename images/ubuntu/{22.10 => 23.10}/extra-packages (100%) diff --git a/.github/workflows/ubuntu-images.yaml b/.github/workflows/ubuntu-images.yaml index c40d6eb77..c9656d0e4 100644 --- a/.github/workflows/ubuntu-images.yaml +++ b/.github/workflows/ubuntu-images.yaml @@ -20,7 +20,7 @@ jobs: build-and-push-images: strategy: matrix: - release: ['16.04', '18.04', '20.04', '22.04', '22.10', '23.04'] + release: ['16.04', '18.04', '20.04', '22.04', '23.04', '23.10'] runs-on: ubuntu-latest steps: diff --git a/images/ubuntu/22.10/Containerfile b/images/ubuntu/23.10/Containerfile similarity index 87% rename from images/ubuntu/22.10/Containerfile rename to images/ubuntu/23.10/Containerfile index 6ee663532..f2d975bb0 100644 --- a/images/ubuntu/22.10/Containerfile +++ b/images/ubuntu/23.10/Containerfile @@ -1,8 +1,8 @@ -FROM docker.io/library/ubuntu:22.10 +FROM docker.io/library/ubuntu:23.10 LABEL com.github.containers.toolbox="true" \ name="ubuntu-toolbox" \ - version="22.10" \ + version="23.10" \ usage="This image is meant to be used with the toolbox command" \ summary="Base image for creating Ubuntu toolbox containers" \ maintainer="Ievgen Popovych " @@ -38,5 +38,9 @@ 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/22.10/extra-packages b/images/ubuntu/23.10/extra-packages similarity index 100% rename from images/ubuntu/22.10/extra-packages rename to images/ubuntu/23.10/extra-packages From 9c2b5e9a4bac9ae3152fa8d808797de76c5c873c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 12 Dec 2023 15:34:11 +0100 Subject: [PATCH 2/2] .zuul: Drop testing on Fedora 37 Fedora 37 reached End of Life on 15th November 2023: https://docs.fedoraproject.org/en-US/releases/eol/ https://github.com/containers/toolbox/pull/1418 --- .zuul.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index ea6b4fd78..0140b951a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -81,24 +81,12 @@ pre-run: playbooks/setup-env.yaml run: playbooks/system-test.yaml -- job: - name: system-test-fedora-37 - description: Run Toolbx's system tests in Fedora 37 - timeout: 3000 - nodeset: - nodes: - - name: fedora-37 - label: cloud-fedora-37 - pre-run: playbooks/setup-env.yaml - run: playbooks/system-test.yaml - - project: periodic: jobs: - system-test-fedora-rawhide - system-test-fedora-39 - system-test-fedora-38 - - system-test-fedora-37 check: jobs: - unit-test @@ -107,7 +95,6 @@ - system-test-fedora-rawhide - system-test-fedora-39 - system-test-fedora-38 - - system-test-fedora-37 gate: jobs: - unit-test @@ -116,4 +103,3 @@ - system-test-fedora-rawhide - system-test-fedora-39 - system-test-fedora-38 - - system-test-fedora-37