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.

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

[7.17] ironbank: use ubi:9.3 (backport #12077) #12086

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2023

This is an automatic backport of pull request #12077 done by Mergify.
Cherry-pick of f6a3cc0 has failed:

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

You are currently cherry-picking commit f6a3cc03f.
  (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:   packaging/ironbank/Dockerfile.tmpl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packaging/ironbank/hardening_manifest.yaml.tmpl

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit f6a3cc0)

# Conflicts:
#	packaging/ironbank/hardening_manifest.yaml.tmpl
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 21, 2023
@mergify mergify bot assigned v1v Nov 21, 2023
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Nov 21, 2023
@v1v
Copy link
Member

v1v commented Nov 21, 2023

if docker arm for ubi is needed in the APM Server then elastic/beats#37165 is required

@v1v v1v merged commit e7347e8 into 7.17 Nov 21, 2023
8 checks passed
@v1v v1v deleted the mergify/bp/7.17/pr-12077 branch November 21, 2023 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant