Revert "[7.17] [build/docker] Upgrade Ubuntu base image to 22.04 (#16… (

elastic#170432) …2282) (elastic#169581)" This reverts commit c8260c3.
mistic · Nov 2, 2023 · 846ce67 · 846ce67
1 parent 1dad98b
commit 846ce67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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}}