Skip to content

Add multiplatform images#5075

Merged
blakerouse merged 6 commits intoelastic:mainfrom
michel-laterman:docker-multiplaform-builds
Jul 3, 2025
Merged

Add multiplatform images#5075
blakerouse merged 6 commits intoelastic:mainfrom
michel-laterman:docker-multiplaform-builds

Conversation

@michel-laterman
Copy link
Copy Markdown
Contributor

@michel-laterman michel-laterman commented Jul 2, 2025

What is the problem this PR solves?

Multiplatform images are not being produced

How does this PR solve the problem?

Use multiplatform builds which were incorrectly removed when migrating to mage.

How to test this PR locally

mage docker:image

@michel-laterman michel-laterman requested a review from a team as a code owner July 2, 2025 19:42
@michel-laterman michel-laterman added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jul 2, 2025
@prodsecmachine
Copy link
Copy Markdown

prodsecmachine commented Jul 2, 2025 •
edited
Loading

🎉 Snyk checks have passed. No issues have been found so far.

✅ security/snyk check is complete. No issues have been found. (View Details)

✅ license/snyk check is complete. No issues have been found. (View Details)

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 2, 2025

This pull request does not have a backport label. Could you fix it @michel-laterman? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@michel-laterman michel-laterman force-pushed the docker-multiplaform-builds branch from c2114a6 to 7eb5b55 Compare July 2, 2025 19:42
pkoutsovasilis
pkoutsovasilis reviewed Jul 2, 2025
View reviewed changes
@michel-laterman michel-laterman added backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Jul 2, 2025
blakerouse
blakerouse reviewed Jul 2, 2025
View reviewed changes
blakerouse
blakerouse previously approved these changes Jul 2, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good.

Thanks for fixing this and keeping the ability to filter.

@blakerouse blakerouse enabled auto-merge (squash) July 2, 2025 20:41
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Jul 2, 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

blakerouse
blakerouse approved these changes Jul 3, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good.

@blakerouse blakerouse merged commit 5c01471 into elastic:main Jul 3, 2025
9 checks passed
mergify bot pushed a commit that referenced this pull request Jul 3, 2025
@michel-laterman @mergify
Add multiplatform images (#5075)
ba6ab78 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.

(cherry picked from commit 5c01471)
@mergify mergify bot mentioned this pull request Jul 3, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jul 3, 2025
@michel-laterman @mergify
Add multiplatform images (#5075)
e1db777 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.

(cherry picked from commit 5c01471)
@mergify mergify bot mentioned this pull request Jul 3, 2025
Merged
@pkoutsovasilis pkoutsovasilis mentioned this pull request Jul 3, 2025
Merged
8 tasks
ycombinator pushed a commit that referenced this pull request Jul 3, 2025
@mergify @michel-laterman
Add multiplatform images (#5075) (#5078)
8241626 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.

(cherry picked from commit 5c01471)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
ebeahan pushed a commit that referenced this pull request Jul 3, 2025
@mergify @michel-laterman
Add multiplatform images (#5075) (#5079)
41e3e87 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.

(cherry picked from commit 5c01471)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
@michel-laterman michel-laterman deleted the docker-multiplaform-builds branch July 3, 2025 15:11
michel-laterman added a commit that referenced this pull request Sep 3, 2025
@michel-laterman
Add multiplatform images (#5075)
86156cd 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.
michel-laterman added a commit to michel-laterman/fleet-server that referenced this pull request Sep 3, 2025
@michel-laterman
Add multiplatform images (elastic#5075)
d838639 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.
@michel-laterman michel-laterman mentioned this pull request Sep 3, 2025
Merged
michel-laterman added a commit to michel-laterman/fleet-server that referenced this pull request Sep 4, 2025
@michel-laterman
Add multiplatform images (elastic#5075)
7d77233 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.
michel-laterman added a commit to michel-laterman/fleet-server that referenced this pull request Sep 4, 2025
@michel-laterman
Add multiplatform images (elastic#5075)
ffe49a9 
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.
@michel-laterman michel-laterman mentioned this pull request Sep 4, 2025
Merged
michel-laterman added a commit that referenced this pull request Sep 24, 2025
@michel-laterman
[9.0] backport #4912 #4985 #5000 #5075 (#5423)
9fd0c29 
Backport PRs #4912 #4985 #5000 #5075 to 9.0 so that mage is used instead of Make.
Do additional cleanup so FIPS references have been removed.
Chane Buildkite to use plugins.
michel-laterman added a commit that referenced this pull request Sep 24, 2025
@michel-laterman
[8.18] backport #4912 #4985 #5000 #5075 (#5397)
44a978c 
* Convert Makefile to magefile.go (#4912)

Reimplement Makefile targets in mage.
Change buildkite pipeline to use mage.
Change Dockerfile* to use mage.

(cherry picked from commit db5f46b)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
#	.buildkite/scripts/local_build.sh
#	.buildkite/scripts/test-release.sh
#	Dockerfile.build
#	Dockerfile.fips
#	Makefile
#	NOTICE.txt
#	README.md
#	dev-tools/cloud/Makefile
#	dev-tools/cloud/terraform/main.tf
#	dev-tools/e2e/Dockerfile
#	dev-tools/e2e/build.sh
#	dev-tools/e2e/validatecerts.go
#	dev-tools/go.mod
#	dev-tools/go.sum
#	docs/developers-guide.md
#	docs/docker-images.md
#	docs/fips.md
#	testing/e2e/fips_test.go

* Ensure directory is made within zip artifacts (#4985)

* Ensure directory is made within zip artifacts

* Make test:release extraction stricter

* Fail cloude2e step if tests can't run, fix image publication (#5000)

Fail the pipeline if cloude2e tests can't run.
mage docker:image now uses the DOCKER_IMAGE env var.

* Add multiplatform images (#5075)

Fixes issue where change from make to mage, result in the loss of creating multiple platform images.

* Fix cherry-picks

* change to serialdeps

* Use magefile from main

* Remove FIPS references, use docker plugin

* Use bk plugins

* cleanup go.mod in dev-tools and pkg/api

* Add missing EC secret to cloud e2e step

* Review feedback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ebeahan ebeahan ebeahan left review comments

@blakerouse blakerouse blakerouse approved these changes

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

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

@pkoutsovasilis pkoutsovasilis Awaiting requested review from pkoutsovasilis

Assignees

No one assigned

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch bug Something isn't working 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

@michel-laterman @prodsecmachine @blakerouse @ebeahan @pkoutsovasilis