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

Update Ubuntu 20.04 with 24.04 for Docker base images #40942

Merged
merged 10 commits into from
Oct 8, 2024
Merged

Update Ubuntu 20.04 with 24.04 for Docker base images #40942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
15d67e9
Replace Ubuntu 20.04 with 22.04 for Docker base images
vinit-chauhan Sep 22, 2024
8482522
Added link to pull request in CHANGELOG.next.asciidoc
vinit-chauhan Sep 22, 2024
fe5b724
Merge branch 'main' into upgrade_base_image_docker_build
mauri870 Sep 23, 2024
a524094
Merge branch 'main' into upgrade_base_image_docker_build
vinit-chauhan Sep 30, 2024
d1a0af8
update to ubuntu:24.04
vinit-chauhan Oct 1, 2024
fa28be3
Merge branch 'main' into upgrade_base_image_docker_build
vinit-chauhan Oct 1, 2024
0a97593
Merge branch 'main' into upgrade_base_image_docker_build
jlind23 Oct 2, 2024
ce68c08
remove default ubuntu user in 24.04 while generating container.
vinit-chauhan Oct 2, 2024
75c0a38
Merge branch 'main' into upgrade_base_image_docker_build
andrzej-stencel Oct 7, 2024
4c86b12
Merge branch 'main' into upgrade_base_image_docker_build
jlind23 Oct 7, 2024
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: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415]
- The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions.
- Update to Go 1.22.7. {pull}41018[41018]
- Replace Ubuntu 20.04 with 24.04 for Docker base images {issue}40743[40743] {pull}40942[40942]


*Auditbeat*

Expand Down
4 changes: 2 additions & 2 deletions dev-tools/packaging/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ shared:
- &docker_spec
<<: *binary_spec
extra_vars:
from: '--platform=linux/amd64 ubuntu:20.04'
from: '--platform=linux/amd64 ubuntu:24.04'
buildFrom: '--platform=linux/amd64 cgr.dev/chainguard/wolfi-base'
user: '{{ .BeatName }}'
linux_capabilities: ''
Expand All @@ -172,7 +172,7 @@ shared:
- &docker_arm_spec
<<: *docker_spec
extra_vars:
from: '--platform=linux/arm64 ubuntu:20.04'
from: '--platform=linux/arm64 ubuntu:24.04'
buildFrom: '--platform=linux/arm64 cgr.dev/chainguard/wolfi-base'

- &docker_ubi_spec
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/packaging/templates/docker/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ RUN for iter in {1..10}; do \
{{- end }}

{{- if contains .from "ubuntu" }}
RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu

RUN for iter in {1..10}; do \
apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl gawk libcap2-bin xz-utils && \
Expand Down
Loading