Skip to content

Commit dda4c6f

Browse files
authored
[8.19] Update docker default base to Ubuntu 24.04 (elastic#128534)
* Update base image for 8.19 docker default image to ubuntu 24.04 * Remove ubuntu user before adding elasticsearch * Update netcat reference We use openbsd version as its - newer and covers e.g. newer usecases like ipv6 - matching what we use in our wolfi images
1 parent d77d2cf commit dda4c6f

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", "dockerfiles/default/Dockerfile"),
16+
DEFAULT("ubuntu:24.04", "", "apt-get", "dockerfiles/default/Dockerfile"),
1717

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

distribution/docker/src/docker/dockerfiles/default/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,15 @@ package_manager,
9292
" ${package_manager} update && \n" +
9393
" ${package_manager} upgrade -y && \n" +
9494
" ${package_manager} install -y --no-install-recommends \n" +
95-
" ca-certificates curl netcat p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
95+
" ca-certificates curl netcat-openbsd p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
9696
" ${package_manager} clean && \n" +
9797
" rm -rf /var/lib/apt/lists/*"
9898
) %>
9999

100-
RUN groupadd -g 1000 elasticsearch && \\
101-
adduser --uid 1000 --gid 1000 --home /usr/share/elasticsearch elasticsearch && \\
102-
adduser elasticsearch root && \\
100+
RUN userdel -r ubuntu && \\
101+
groupadd -g 1000 elasticsearch && \\
102+
useradd --uid 1000 --gid 1000 --home-dir /usr/share/elasticsearch --create-home elasticsearch && \\
103+
usermod -aG root elasticsearch && \\
103104
chown -R 0:0 /usr/share/elasticsearch
104105

105106
ENV ELASTIC_CONTAINER=true

docs/changelog/128534.yaml

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

0 commit comments

Comments
 (0)