Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2025

Without this change the FIPS related comment is sneaking into the other Dockerfiles:

https://github.com/elastic/dockerfiles/blob/8.19/logstash/Dockerfile#L45


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

* Make sure FIPS comments belong in the platform-sre Dockerfile

* Update docker/templates/Dockerfile.erb

Co-authored-by: Rye Biesemeyer <[email protected]>

---------

Co-authored-by: Rye Biesemeyer <[email protected]>
(cherry picked from commit 79fac1f)

# Conflicts:
#	docker/templates/Dockerfile.erb
@mergify mergify bot added backport conflicts Detected git conflicts labels Aug 1, 2025
@mergify mergify bot assigned jsvd Aug 1, 2025
@mergify mergify bot added the conflicts Detected git conflicts label Aug 1, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 1, 2025

Cherry-pick of 79fac1f has failed:

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

You are currently cherry-picking commit 79fac1fe.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docker/templates/Dockerfile.erb

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions
Copy link
Contributor

github-actions bot commented Aug 1, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@donoghuc donoghuc merged commit bc7b74d into main Aug 1, 2025
12 checks passed
@donoghuc donoghuc deleted the mergify/bp/main/pr-17875 branch August 1, 2025 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants