From d5d395f5436c9b0c2e6aa395f4d6c3db8eaceb1a Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sun, 10 Nov 2024 15:03:12 +0000
Subject: [PATCH] drop f39, upgrade ubuntu 20 24.04

---
 README.md                                 | 12 ++---
 fedora.39/Dockerfile                      | 55 -----------------------
 {ubuntu.22.04 => ubuntu.24.04}/Dockerfile |  2 +-
 3 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 fedora.39/Dockerfile
 rename {ubuntu.22.04 => ubuntu.24.04}/Dockerfile (98%)

diff --git a/README.md b/README.md
index 0b3b447..6950e22 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ lots of development packages.  This takes time and lots of bandwidth.
 To speed up the builds, we create Docker images containing a full development
 environment.
 
-The main tests are done in an Ubuntu 22.04 (latest) environment.  
+The main tests are done in an Ubuntu 24.04 (latest) environment.  
 We also perform weekly tests under Fedora.
 
 ## Building
 
 The images are built by more GitHub Actions:
 
-- [ubuntu.yml](.github/workflows/ubuntu.yml) -- Ubuntu 22.04
-- [fedora.yml](.github/workflows/fedora.yml) -- Fedora 39, 40, 41 (rawhide)
+- [ubuntu.yml](.github/workflows/ubuntu.yml) -- Ubuntu 24.04
+- [fedora.yml](.github/workflows/fedora.yml) -- Fedora 40, 41, 42 (rawhide)
 
 Each Action is scheduled to run automaticaly on the 1<sup>st</sup> of the month at 3am.  
 This will ensure we have up-to-date packages for every environment.
@@ -29,8 +29,8 @@ The builds are defined by Dockerfiles:
 
 | Dockerfile                                         | Description         |
 | :------------------------------------------------- | :------------------ |
-| [ubuntu.22.04/Dockerfile](ubuntu.22.04/Dockerfile) | Ubuntu 22.04        |
-| [fedora.39/Dockerfile](fedora.39/Dockerfile)       | Fedora 39           |
+| [ubuntu.24.04/Dockerfile](ubuntu.24.04/Dockerfile) | Ubuntu 24.04        |
 | [fedora.40/Dockerfile](fedora.40/Dockerfile)       | Fedora 40           |
-| [fedora.41/Dockerfile](fedora.41/Dockerfile)       | Fedora 41 (rawhide) |
+| [fedora.41/Dockerfile](fedora.41/Dockerfile)       | Fedora 41           |
+| [fedora.42/Dockerfile](fedora.42/Dockerfile)       | Fedora 42 (rawhide) |
 
diff --git a/fedora.39/Dockerfile b/fedora.39/Dockerfile
deleted file mode 100644
index acdc76f..0000000
--- a/fedora.39/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Create a NeoMutt development environment based on Fedora 39
-FROM fedora:39
-
-RUN \
-	dnf clean all && \
-	dnf -y update && \
-	dnf install -y \
-		ccache \
-		clang \
-		clang-tools-extra \
-		cyrus-sasl-devel \
-		docbook-dtds \
-		docbook-style-xsl \
-		doxygen \
-		elinks \
-		gcc \
-		gdbm-devel \
-		gettext-devel \
-		git \
-		gnutls-devel \
-		gpgme-devel \
-		graphviz \
-		iwyu \
-		jq \
-		krb5-devel \
-		kyotocabinet-devel \
-		lcov \
-		libdb-devel \
-		libgsasl-devel \
-		libidn-devel \
-		libtdb-devel \
-		libxslt \
-		libzstd-devel \
-		lmdb-devel \
-		lua \
-		lua-devel \
-		lynx \
-		lz4-devel \
-		ncurses-devel \
-		notmuch-devel \
-		openssl-devel \
-		pcre2-devel \
-		qdbm-devel \
-		redhat-rpm-config \
-		rocksdb-devel \
-		rsync \
-		slang-devel \
-		sqlite \
-		sqlite-devel \
-		tar \
-		tcl \
-		tokyocabinet-devel \
-		w3m
-
-# vim: syn=dockerfile
diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.24.04/Dockerfile
similarity index 98%
rename from ubuntu.22.04/Dockerfile
rename to ubuntu.24.04/Dockerfile
index 9b7c912..819ce8d 100644
--- a/ubuntu.22.04/Dockerfile
+++ b/ubuntu.24.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive