From 9d139f6192647a91010e95c84d651644158abc69 Mon Sep 17 00:00:00 2001
From: Jon <jon@elastic.co>
Date: Mon, 23 Oct 2023 14:49:06 -0500
Subject: [PATCH] [build/docker] Upgrade Ubuntu base image to 22.04 (#162282)

Release note:
The default container's base image has been upgraded from Ubuntu 20.04
to 22.04
---
 docs/setup/docker.asciidoc                                      | 2 +-
 src/dev/build/tasks/os_packages/docker_generator/run.ts         | 2 +-
 .../os_packages/docker_generator/templates/base/Dockerfile      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index 4dcd80d1bfd66b..d8c09b39a3cc4a 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -10,7 +10,7 @@
 :es-docker-image:     {es-docker-repo}:{version}
 
 Docker images for {kib} are available from the Elastic Docker registry. The
-base image is https://hub.docker.com/_/ubuntu[ubuntu:20.04].
+base image is https://hub.docker.com/_/ubuntu[ubuntu:22.04].
 
 A list of all published Docker images and tags is available at
 https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
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 f9da19183d866a..636096b921b07d 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 baseImageName = '';
-  if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:20.04';
+  if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:22.04';
   if (flags.baseImage === 'ubi8') baseImageName = 'docker.elastic.co/ubi8/ubi-minimal:latest';
   if (flags.baseImage === 'ubi9') baseImageName = '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 8db4b419a184af..73968d57529f62 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
@@ -189,7 +189,7 @@ ENTRYPOINT ["/bin/tini", "--"]
 CMD ["/app/kibana.sh"]
 # Generate a stub command that will be overwritten at runtime
 RUN mkdir /app && \
-    echo -e '#!/bin/bash\nexec /usr/local/bin/kibana-docker' > /app/kibana.sh && \
+    /usr/bin/echo -e '#!/bin/bash\nexec /usr/local/bin/kibana-docker' > /app/kibana.sh && \
     chmod 0555 /app/kibana.sh
 {{/cloud}}