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: update hardening to 8.8 (backport #11788) #11789

Merged
merged 4 commits into from
Oct 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2023

This is an automatic backport of pull request #11788 done by Mergify.
Cherry-pick of 0e174d1 has failed:

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

You are currently cherry-picking commit 0e174d100.
  (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:   packaging/ironbank/hardening_manifest.yaml.tmpl

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/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 0e174d1)

# Conflicts:
#	packaging/ironbank/hardening_manifest.yaml.tmpl
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 6, 2023
@mergify mergify bot assigned v1v Oct 6, 2023
@v1v v1v added backport and removed conflicts There is a conflict in the backported pull request labels Oct 6, 2023
@@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.6"
BASE_TAG: "8.8"
ELASTIC_STACK: "{{ beat_version }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I see, #8732 was not backported to 7.17 hence we keep using beat_version

@mergify
Copy link
Contributor Author

mergify bot commented Oct 9, 2023

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

@mergify mergify bot merged commit 106e9af into 7.17 Oct 9, 2023
@mergify mergify bot deleted the mergify/bp/7.17/pr-11788 branch October 9, 2023 08:12
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