Skip to content

Commit ed0234b

Browse files
committed
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.
1 parent a57b84d commit ed0234b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update -qq && \
44
DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update -qq && \
44
DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \

Dockerfile.toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update -qq && \
44
DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fi
2929

3030
time docker build -f Dockerfile . -t mstorsjo/llvm-mingw:latest -t mstorsjo/llvm-mingw:$TAG
3131

32-
DISTRO=ubuntu-22.04-$(uname -m)
32+
DISTRO=ubuntu-24.04-$(uname -m)
3333
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
3434

3535
if [ -n "$NATIVEONLY" ]; then

0 commit comments

Comments
 (0)