From ed0234b254507a3d6e26056799935e67cc823a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 9 Apr 2025 11:08:43 +0300
Subject: [PATCH] docker: Bump the base images to Ubuntu 24.04

As the releases are built (without a surrounding extra container)
on GitHub Actions these days, we don't need to hold the docker
images back to an old version for the sake of compatibility;
instead, updating to a newer version provides more modern tools
for users of the docker image.

The script release.sh, which earlier was used for building releases,
uses docker for doing clean isolated builds, and thus needs to be
updated with the distro version used in the dockerfiles.
---
 Dockerfile           | 2 +-
 Dockerfile.dev       | 2 +-
 Dockerfile.toolchain | 2 +-
 release.sh           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c8b3ad3..82486c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 32e220c..8891b2c 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \
diff --git a/Dockerfile.toolchain b/Dockerfile.toolchain
index b0ff655..5ad3a8d 100644
--- a/Dockerfile.toolchain
+++ b/Dockerfile.toolchain
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \
diff --git a/release.sh b/release.sh
index 78c250f..a305e7b 100755
--- a/release.sh
+++ b/release.sh
@@ -29,7 +29,7 @@ fi
 
 time docker build -f Dockerfile . -t mstorsjo/llvm-mingw:latest -t mstorsjo/llvm-mingw:$TAG
 
-DISTRO=ubuntu-22.04-$(uname -m)
+DISTRO=ubuntu-24.04-$(uname -m)
 docker run --rm mstorsjo/llvm-mingw:latest sh -c "cd /opt && mv llvm-mingw llvm-mingw-$TAG-ucrt-$DISTRO && tar -Jcvf - --format=ustar --numeric-owner --owner=0 --group=0 llvm-mingw-$TAG-ucrt-$DISTRO" > llvm-mingw-$TAG-ucrt-$DISTRO.tar.xz
 
 if [ -n "$NATIVEONLY" ]; then