Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build/docker] Upgrade Ubuntu base image to 22.04 #162282

Merged
merged 12 commits into from
Oct 23, 2023
Merged

[build/docker] Upgrade Ubuntu base image to 22.04 #162282

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
15204ad
[build/docker] Upgrade Ubuntu base image to 22.04
jbudz Jul 19, 2023
e21013f
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Jul 19, 2023
8dac0f5
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Jul 19, 2023
d0350ef
fix echo
jbudz Jul 21, 2023
dcefc22
fix echo
jbudz Jul 21, 2023
0530cf3
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Jul 21, 2023
b158ab3
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Jul 27, 2023
e9cacc8
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Oct 18, 2023
90c3ead
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Oct 18, 2023
6316e08
update docs
jbudz Oct 18, 2023
b88eb2f
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Oct 23, 2023
a9126b9
Merge branch 'main' into build/docker-upgrade-ubuntu
jbudz Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/docker_generator/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for local testing and can be ignored, it's meant to be overwritten. RUN uses sh, which has a builtin echo that doesn't support the -e flag.

chmod 0555 /app/kibana.sh
{{/cloud}}

Expand Down