From b911d8da34478055242ee42c9957b046cdde4e96 Mon Sep 17 00:00:00 2001
From: Robert Steiner <robert@flower.dev>
Date: Tue, 24 Sep 2024 12:43:35 +0200
Subject: [PATCH] feat(framework) Upgrade Ubuntu base image to version 24.04
 (#4226)

Signed-off-by: Robert Steiner <robert@flower.ai>
---
 dev/build-docker-image-matrix.py  | 2 +-
 doc/source/conf.py                | 2 +-
 src/docker/base/ubuntu/Dockerfile | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev/build-docker-image-matrix.py b/dev/build-docker-image-matrix.py
index c19949e358b9..52c96e3cca7a 100644
--- a/dev/build-docker-image-matrix.py
+++ b/dev/build-docker-image-matrix.py
@@ -134,7 +134,7 @@ def tag_latest_ubuntu_with_flwr_version(image: BaseImage) -> List[str]:
     ubuntu_base_images = generate_base_images(
         flwr_version,
         SUPPORTED_PYTHON_VERSIONS,
-        [Distro(DistroName.UBUNTU, "22.04")],
+        [Distro(DistroName.UBUNTU, "24.04")],
     )
     # alpine base images for the latest supported python version
     alpine_base_images = generate_base_images(
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 033b345b60cc..d78aeda0d48e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -95,7 +95,7 @@
 rst_prolog = """
 .. |stable_flwr_version| replace:: 1.11.1
 .. |stable_flwr_superlink_docker_digest| replace:: 4b317d5b6030710b476f4dbfab2c3a33021ad40a0fcfa54d7edd45e0c51d889c
-.. |ubuntu_version| replace:: 22.04
+.. |ubuntu_version| replace:: 24.04
 .. |setuptools_version| replace:: 70.3.0
 .. |pip_version| replace:: 24.1.2
 """
diff --git a/src/docker/base/ubuntu/Dockerfile b/src/docker/base/ubuntu/Dockerfile
index 47655b1a52a1..b52599a80784 100644
--- a/src/docker/base/ubuntu/Dockerfile
+++ b/src/docker/base/ubuntu/Dockerfile
@@ -15,7 +15,7 @@
 
 # hadolint global ignore=DL3008
 ARG DISTRO=ubuntu
-ARG DISTRO_VERSION=22.04
+ARG DISTRO_VERSION=24.04
 FROM $DISTRO:$DISTRO_VERSION AS python
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -87,11 +87,10 @@ RUN  apt-get update \
     ca-certificates \
     && rm -rf /var/lib/apt/lists/* \
     # add non-root user
-    && adduser \
+    && useradd \
     --no-create-home \
-    --home /app \
-    --disabled-password \
-    --gecos "" \
+    --home-dir /app \
+    -c "" \
     --uid 49999 app \
     && mkdir -p /app \
     && chown -R app:app /app