Browse Source

[8.19] Update docker default base to Ubuntu 24.04 (#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
Rene Groeschke 4 months ago
parent
commit
dda4c6fa78

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

@@ -13,7 +13,7 @@ package org.elasticsearch.gradle.internal;
  * This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.
  */
 public enum DockerBase {
-    DEFAULT("ubuntu:20.04", "", "apt-get", "dockerfiles/default/Dockerfile"),
+    DEFAULT("ubuntu:24.04", "", "apt-get", "dockerfiles/default/Dockerfile"),
 
     // "latest" here is intentional, since the image name specifies "8"
     UBI("docker.elastic.co/ubi8/ubi-minimal:latest", "-ubi8", "microdnf", "Dockerfile"),

+ 5 - 4
distribution/docker/src/docker/dockerfiles/default/Dockerfile

@@ -92,14 +92,15 @@ package_manager,
   "      ${package_manager} update && \n" +
   "      ${package_manager} upgrade -y && \n" +
   "      ${package_manager} install -y --no-install-recommends \n" +
-  "        ca-certificates curl netcat p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
+  "        ca-certificates curl netcat-openbsd p11-kit unzip zip ${docker_base == 'cloud' ? 'wget' : '' } && \n" +
   "      ${package_manager} clean && \n" +
   "      rm -rf /var/lib/apt/lists/*"
 ) %>
 
-RUN groupadd -g 1000 elasticsearch && \\
-    adduser --uid 1000 --gid 1000 --home /usr/share/elasticsearch elasticsearch && \\
-    adduser elasticsearch root && \\
+RUN userdel -r ubuntu && \\
+    groupadd -g 1000 elasticsearch && \\
+    useradd --uid 1000 --gid 1000 --home-dir /usr/share/elasticsearch --create-home elasticsearch && \\
+    usermod -aG root elasticsearch && \\
     chown -R 0:0 /usr/share/elasticsearch
 
 ENV ELASTIC_CONTAINER=true

+ 5 - 0
docs/changelog/128534.yaml

@@ -0,0 +1,5 @@
+pr: 128534
+summary: "Update default docker base image to Ubuntu 24.04"
+area: Packaging
+type: upgrade
+issues: []