Skip to content

Commit 7ccf54d

Browse files
authored
[8.18] Update docker default base to Ubuntu 24.04 (#128732)
* [8.18] Update docker default base to Ubuntu 24.04 * Update docs/changelog/128732.yaml * Tweak changelog
1 parent 1d45cd4 commit 7ccf54d

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.
1414
*/
1515
public enum DockerBase {
16-
DEFAULT("ubuntu:20.04", "", "apt-get"),
16+
DEFAULT("ubuntu:24.04", "", "apt-get"),
1717

1818
// "latest" here is intentional, since the image name specifies "8"
1919
UBI("docker.elastic.co/ubi8/ubi-minimal:latest", "-ubi8", "microdnf"),

distribution/docker/src/docker/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ RUN yes no | dpkg-reconfigure dash && \\
183183
" ${package_manager} update && \n" +
184184
" ${package_manager} upgrade -y && \n" +
185185
" ${package_manager} install -y --no-install-recommends \n" +
186-
" ca-certificates curl netcat p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
186+
" ca-certificates curl netcat-openbsd p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
187187
" ${package_manager} clean && \n" +
188188
" rm -rf /var/lib/apt/lists/*"
189189
) %>
@@ -202,9 +202,10 @@ RUN <%= retry.loop(
202202
203203
204204
<% if (docker_base == "default" || docker_base == "cloud") { %>
205-
RUN groupadd -g 1000 elasticsearch && \\
206-
adduser --uid 1000 --gid 1000 --home /usr/share/elasticsearch elasticsearch && \\
207-
adduser elasticsearch root && \\
205+
RUN userdel -r ubuntu && \\
206+
groupadd -g 1000 elasticsearch && \\
207+
useradd --uid 1000 --gid 1000 --home-dir /usr/share/elasticsearch --create-home elasticsearch && \\
208+
usermod -aG root elasticsearch && \\
208209
chown -R 0:0 /usr/share/elasticsearch
209210
<% } else if (docker_base == "wolfi") { %>
210211
RUN groupadd -g 1000 elasticsearch && \

docs/changelog/128732.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128732
2+
summary: "Update default docker base image to Ubuntu 24.04"
3+
area: Packaging
4+
type: upgrade
5+
issues: []

0 commit comments

Comments
 (0)