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

[8.11] [build/docker] Upgrade Ubuntu base image to 22.04 (#162282) (#169580)

Browse source 
# Backport

This will backport the following commits from `main` to `8.11`:
- [[build/docker] Upgrade Ubuntu base image to 22.04
(#162282)](https://github.com/elastic/kibana/pull/162282)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Jon","email":"jon@elastic.co"},"sourceCommit":{"committedDate":"2023-10-23T19:49:06Z","message":"[build/docker]
Upgrade Ubuntu base image to 22.04 (#162282)\n\nRelease note:\r\nThe
default container's base image has been upgraded from Ubuntu 20.04\r\nto
22.04","sha":"9d139f6192647a91010e95c84d651644158abc69","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement","Team:Operations","backport:prev-minor","ci:cloud-redeploy","ci:build-serverless-image","v8.12.0"],"number":162282,"url":"https://github.com/elastic/kibana/pull/162282","mergeCommit":{"message":"[build/docker]
Upgrade Ubuntu base image to 22.04 (#162282)\n\nRelease note:\r\nThe
default container's base image has been upgraded from Ubuntu 20.04\r\nto
22.04","sha":"9d139f6192647a91010e95c84d651644158abc69"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/162282","number":162282,"mergeCommit":{"message":"[build/docker]
Upgrade Ubuntu base image to 22.04 (#162282)\n\nRelease note:\r\nThe
default container's base image has been upgraded from Ubuntu 20.04\r\nto
22.04","sha":"9d139f6192647a91010e95c84d651644158abc69"}}]}] BACKPORT-->

Co-authored-by: Jon <jon@elastic.co>
This commit is contained in:
Kibana Machine 2023-10-23 17:02:30 -04:00 • committed by GitHub
parent 379d9eba4c
commit a382569d1a
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: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

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: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';

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

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