From 846ce67966300cae0c319d709ca82ac158ec4df3 Mon Sep 17 00:00:00 2001
From: Jon <jon@elastic.co>
Date: Thu, 2 Nov 2023 15:33:04 -0500
Subject: [PATCH] =?UTF-8?q?Revert=20"[7.17]=20[build/docker]=20Upgrade=20U?=
 =?UTF-8?q?buntu=20base=20image=20to=2022.04=20(#16=E2=80=A6=20(#170432)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…2282) (#169581)"

This reverts commit c8260c30d407f5c67d388d9a38d010b47cd00ae9.
---
 src/dev/build/tasks/os_packages/docker_generator/run.ts         | 2 +-
 .../os_packages/docker_generator/templates/base/Dockerfile      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index b9d100aa18d6fa..f7d3d3debd54fc 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -39,7 +39,7 @@ export async function runDockerGenerator(
   }
 ) {
   let baseOSImage = '';
-  if (flags.ubuntu) baseOSImage = 'ubuntu:22.04';
+  if (flags.ubuntu) baseOSImage = 'ubuntu:20.04';
   if (flags.ubi8) baseOSImage = 'docker.elastic.co/ubi8/ubi-minimal:latest';
   if (flags.ubi9) baseOSImage = 'docker.elastic.co/ubi9/ubi-minimal:latest';
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
index ef26d050be2f10..17102eb26438be 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
@@ -179,7 +179,7 @@ ENTRYPOINT ["/bin/tini", "--"]
 CMD ["/app/kibana.sh"]
 # Generate a stub command that will be overwritten at runtime
 RUN mkdir /app && \
-    /usr/bin/echo -e '#!/bin/bash\nexec /usr/local/bin/kibana-docker' > /app/kibana.sh && \
+    echo -e '#!/bin/bash\nexec /usr/local/bin/kibana-docker' > /app/kibana.sh && \
     chmod 0555 /app/kibana.sh
 {{/cloud}}