Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(framework) Upgrade Ubuntu base image to version 24.04 #4226

Merged
merged 2 commits into from
Sep 24, 2024
Merged

feat(framework) Upgrade Ubuntu base image to version 24.04 #4226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7380c17
feat(framework) Upgrade Ubuntu base image to version 24.04
Robert-Steiner Sep 17, 2024
4cddae8
Merge branch 'main' into feat/update-ubuntu-24
tanertopal Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/build-docker-image-matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down
9 changes: 4 additions & 5 deletions src/docker/base/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down