From fe2ec0e7c9465f0a1b1e19cc169b66a37a14b883 Mon Sep 17 00:00:00 2001
From: Denis Rechkunov <denis.rechkunov@elastic.co>
Date: Sun, 22 Dec 2024 21:34:07 +0100
Subject: [PATCH] Revert the Ubuntu version update

Due to ECE compatibility issues we have to switch back to 20.04.
---
 CHANGELOG.next.asciidoc                              | 1 +
 dev-tools/packaging/packages.yml                     | 4 ++--
 dev-tools/packaging/templates/docker/Dockerfile.tmpl | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 4cbe798909e1..5a14299333d5 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -12,6 +12,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 - Fix FQDN being lowercased when used as `host.hostname` {issue}39993[39993]
 - Beats won't log start up information when running under the Elastic Agent {40390}40390[40390]
+- Default Docker base image was reverted to Ubuntu 20.04 due to incompatability issues with glibc {pull}42144[42144]
 
 *Auditbeat*
 
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
index 1391368cf0bd..8c22acc9dba6 100644
--- a/dev-tools/packaging/packages.yml
+++ b/dev-tools/packaging/packages.yml
@@ -159,7 +159,7 @@ shared:
   - &docker_spec
     <<: *binary_spec
     extra_vars:
-      from: '--platform=linux/amd64 ubuntu:24.04'
+      from: '--platform=linux/amd64 ubuntu:20.04'
       buildFrom: '--platform=linux/amd64 cgr.dev/chainguard/wolfi-base'
       user: '{{ .BeatName }}'
       linux_capabilities: ''
@@ -172,7 +172,7 @@ shared:
   - &docker_arm_spec
     <<: *docker_spec
     extra_vars:
-      from: '--platform=linux/arm64 ubuntu:24.04'
+      from: '--platform=linux/arm64 ubuntu:20.04'
       buildFrom: '--platform=linux/arm64 cgr.dev/chainguard/wolfi-base'
 
   - &docker_ubi_spec
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
index 7857cf9cae65..80e034dfae8c 100644
--- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl
+++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
@@ -57,7 +57,6 @@ RUN for iter in {1..10}; do \
 {{- end }}
 
 {{- if contains .from "ubuntu" }}
-RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
 
 RUN for iter in {1..10}; do \
         apt-get update -y && \