Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2024

Change ubi base image from 9.3 to 9.4 used in Ironbank Docker images for all 8.X Beats


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

* Update Ironbank Dockerfile to ubi 9.4

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

(cherry picked from commit cd8ed8a)

# Conflicts:
#	dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
@mergify mergify bot requested a review from a team as a code owner August 9, 2024 09:24
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 9, 2024
@mergify mergify bot requested review from AndersonQ and belimawr and removed request for a team August 9, 2024 09:24
@mergify mergify bot assigned jlind23 Aug 9, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Aug 9, 2024

Cherry-pick of cd8ed8a has failed:

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

You are currently cherry-picking commit cd8ed8a6d5.
  (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:   dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
	both modified:   dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
	both modified:   dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 9, 2024
@botelastic
Copy link

botelastic bot commented Aug 9, 2024

This pull request doesn't have a Team:<team> label.

@mergify
Copy link
Contributor Author

mergify bot commented Aug 12, 2024

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

@pierrehilbert pierrehilbert merged commit 96908cd into 7.17 Aug 12, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/7.17/pr-39988 branch August 12, 2024 06: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 needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants