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

Jump to bottom

feat: Update the default used Ubuntu version to 22.04 #16462

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Update the default used Ubuntu version to 22.04 #16462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 docker/templates/Dockerfile.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ RUN dnf -y upgrade && \
# Minimal distributions do not ship with en language packs.
<% locale = 'C.UTF-8' -%>
<% else -%>
<% base_image = 'ubuntu:20.04' -%>
<% base_image = 'ubuntu:22.04' -%>
<% package_manager = 'apt-get' -%>
<% locale = 'en_US.UTF-8' -%>
<% arch_command = 'dpkg --print-architecture' -%>
Expand Down
2 changes: 1 addition & 1 deletion docs/static/docker.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[[docker]]
=== Running Logstash on Docker
Docker images for Logstash are available from the Elastic Docker
registry. The base image is https://hub.docker.com/_/ubuntu/[ubuntu:20.04].
registry. The 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
Expand Down
4 changes: 2 additions & 2 deletions qa/docker/spec/full/container_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
cleanup_container(@container)
end

it 'has an Ubuntu 20.04 base image' do
expect(exec_in_container(@container, 'cat /etc/os-release').chomp).to match /Ubuntu 20.04/
it 'has an Ubuntu 22.04 base image' do
expect(exec_in_container(@container, 'cat /etc/os-release').chomp).to match /Ubuntu 22.04/
end
end
end
Loading