github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[build/docker] Upgrade Ubuntu base image to 22.04 (#162282)" (#170430)

Browse source 
This reverts commit 9d139f6192.
This commit is contained in:
Jon 2023-11-02 12:56:17 -05:00 • committed by GitHub
parent 096847b686
commit 8133f01ffc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/setup/docker.asciidoc
View file

@ -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:22.04].
base image is https://hub.docker.com/_/ubuntu[ubuntu:20.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

2
src/dev/build/tasks/os_packages/docker_generator/run.ts
View file

@ -39,7 +39,7 @@ export async function runDockerGenerator(
}
) {
let baseImageName = '';
if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:22.04';
if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:20.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';

2
src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
View file

@ -189,7 +189,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}}