Fix docker image build when multiple platforms are specified#5658
Merged
jlind23 merged 3 commits intoelastic:mainfrom Oct 2, 2024
Merged
Fix docker image build when multiple platforms are specified#5658jlind23 merged 3 commits intoelastic:mainfrom
jlind23 merged 3 commits intoelastic:mainfrom
Conversation
pchila
added
bug
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Contributor
|
This pull request does not have a backport label. Could you fix it @pchila? 🙏
|
Contributor
|
|
mergify
bot
added
the
backport-8.x
jlind23
approved these changes
Oct 2, 2024
swiatekm
approved these changes
Oct 2, 2024
mergify bot
pushed a commit
that referenced
this pull request
Oct 2, 2024
Force merging to unblock the unified release process (cherry picked from commit b8a685c) # Conflicts: # magefile.go
7 tasks
|
blakerouse
pushed a commit
that referenced
this pull request
Oct 9, 2024
Force merging to unblock the unified release process
pierrehilbert
pushed a commit
that referenced
this pull request
Oct 14, 2024
#5634) * Add elastic-agent-service container to packaging (#5349) Adds the elastic-agent-service container with the py-connectors component enabled. (cherry picked from commit 701f8b9) # Conflicts: # dev-tools/mage/manifest/manifest.go * Update manifest.go Fix conflicts caused by mergify * Include python wheel packages when moving downloaded dependencies archives (#5647) This commit modifies movePackagesToArchive() function to include python wheel packages introduced with commit 701f8b9 . This solves an issue when packaging docker images using a DROP_PATH env var: prior to this change, the python wheel archives present in DROP_PATH were not moved to `<DROP PATH>/archive/<platform>` failing to create an image for which the Dockerfile expects to install the python wheel package * Fix docker image build when multiple platforms are specified (#5658) Force merging to unblock the unified release process --------- Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Julien Lind <julien.lind@elastic.co> Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR extends the behaviour introduced in #5647 by copying platform-independent components into /archive/ instead of moving them.
This fixes the build of docker image
servicewhen multiple platforms are specified for the build: without this fix the platform-independent component would be moved exactly once, in the directory of the first platform considered during the build.Note:
It seems that
EXTERNAL=true SNAPSHOT=true mage packagestill suffers from some inconsistencies when downloadingconnectorsdependency for multiple platforms but this is unrelated to this fix and will be tracked by a separate issue.Why is it important?
To correctly build elastic-agent-service docker image for multiple platforms during the Unified Release.
Checklist
./changelog/fragmentsusing the changelog toolDisruptive User Impact
How to test this PR locally
Related issues
Questions to ask yourself