Skip to content

[8.17](backport #44108) Remove systemd from the Wolfi image#44117

Merged
rdner merged 3 commits into8.17from
mergify/bp/8.17/pr-44108
Apr 29, 2025
Merged

[8.17](backport #44108) Remove systemd from the Wolfi image#44117
rdner merged 3 commits into8.17from
mergify/bp/8.17/pr-44108

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 29, 2025

Due to the security focus and minimalistic nature of the image, systemd should not be present in the image.

Follow up to #44056


This is an automatic backport of pull request #44108 done by Mergify.

Due to the security focus and minimalistic nature of the image,
systemd should not be present in the image.

(cherry picked from commit 8aac050)

# Conflicts:
#	docs/reference/filebeat/filebeat-input-journald.md
#	docs/release-notes/index.md
@mergify mergify bot requested a review from a team as a code owner April 29, 2025 13:52
@mergify mergify bot requested review from khushijain21 and rdner and removed request for a team April 29, 2025 13:52
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 29, 2025
@mergify mergify bot assigned rdner Apr 29, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 29, 2025

Cherry-pick of 8aac050 has failed:

On branch mergify/bp/8.17/pr-44108
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 8aac05097.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   dev-tools/packaging/templates/docker/Dockerfile.tmpl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/reference/filebeat/filebeat-input-journald.md
	deleted by us:   docs/release-notes/index.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 29, 2025
@rdner rdner removed the request for review from khushijain21 April 29, 2025 14:02
@rdner rdner enabled auto-merge (squash) April 29, 2025 14:02
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Apr 29, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 29, 2025
@rdner rdner merged commit a60c51d into 8.17 Apr 29, 2025
171 checks passed
@rdner rdner deleted the mergify/bp/8.17/pr-44108 branch April 29, 2025 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants