Skip to content

[8.18] (backport #7817) docker: use the official Red Hat images#8078

Merged
ebeahan merged 3 commits into8.18from
mergify/bp/8.18/pr-7817
May 9, 2025
Merged

[8.18] (backport #7817) docker: use the official Red Hat images#8078
ebeahan merged 3 commits into8.18from
mergify/bp/8.18/pr-7817

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 5, 2025

What does this PR do?

use the official Red Hat images

Why is it important?

Release engineering team is cleaning up legacy UBI images from Elastic's internal Docker registry. Please use the official Red Hat images instead. The following list of images is planned to be removed on May 16th:

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...
This is an automatic backport of pull request #7817 done by [Mergify](https://mergify.com).

@v1v @mergify
docker: use the official Red Hat images (#7817)
13079b5 
(cherry picked from commit 56f5d90)

# Conflicts:
#	dev-tools/packaging/packages.yml
#	dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 5, 2025
@mergify mergify bot requested a review from a team as a code owner May 5, 2025 13:35
@mergify mergify bot requested review from andrzej-stencel and pchila and removed request for a team May 5, 2025 13:35
@mergify mergify bot assigned v1v May 5, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 5, 2025

Cherry-pick of 56f5d90 has failed:

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

You are currently cherry-picking commit 56f5d9053.
  (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/packages.yml
	both modified:   dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 5, 2025
Merged
8 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels May 5, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 5, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

andrzej-stencel
andrzej-stencel reviewed May 7, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@andrzej-stencel andrzej-stencel left a comment

Choose a reason for hiding this comment

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

@v1v can you fix the merge conflicts

@v1v v1v assigned michalpristas and unassigned v1v May 7, 2025
@v1v
Copy link
Copy Markdown
Member

v1v commented May 7, 2025

@v1v can you fix the merge conflicts

I only raised the original PR but there were further changes:

I prefer that it be managed by the other contributors instead

@ebeahan ebeahan enabled auto-merge (squash) May 9, 2025 20:06
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented May 9, 2025

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

@ebeahan ebeahan merged commit af50a9e into 8.18 May 9, 2025
11 checks passed
@ebeahan ebeahan deleted the mergify/bp/8.18/pr-7817 branch May 9, 2025 21:47
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 9, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @michalpristas

@emilioalvap emilioalvap mentioned this pull request Jun 11, 2025
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrzej-stencel andrzej-stencel andrzej-stencel left review comments

@ebeahan ebeahan ebeahan approved these changes

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@michalpristas michalpristas

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@elasticmachine @v1v @ebeahan @andrzej-stencel @michalpristas