Skip to content

[8.17][build/docker] Upgrade Ubuntu to 24.04 (#222244) #222721

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

Merged
jbudz merged 1 commit into from
Jun 5, 2025
Merged

[8.17][build/docker] Upgrade Ubuntu to 24.04 (#222244) #222721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/dev/build/tasks/os_packages/docker_generator/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export async function runDockerGenerator(
}
) {
let baseImageName = '';
if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:20.04';
if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:24.04';
if (flags.baseImage === 'ubi') baseImageName = 'redhat/ubi9-minimal:latest';
/**
* Renovate config contains a regex manager to automatically updates this Chainguard reference
Expand Down
4 changes: 3 additions & 1 deletion src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ RUN chmod g+ws /usr/share/kibana && \
# Remove the suid bit everywhere to mitigate "Stack Clash"
RUN find / -xdev -perm -4000 -exec chmod u-s {} +

{{! Ubuntu 24 containers include ubuntu:1000:1000 as part of a non-root standardization effort }}
{{! Remove ubuntu to maintain the expected kibana user definition }}
# Provide a non-root user to run the process.
RUN groupadd --gid 1000 kibana && \
RUN {{#ubuntu}}userdel -r ubuntu && {{/ubuntu}}groupadd --gid 1000 kibana && \
useradd --uid 1000 --gid 1000 -G 0 \
--home-dir /usr/share/kibana --no-create-home \
kibana
Expand Down