-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
Update Dockerfile to select appropriate architecture on build box #16053
Merged
Conversation
This file contains 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
This commit adds logic to copy the appropriate env2yaml file to the Docker image
robbavey
added a commit
to elastic/dockerfiles
that referenced
this pull request
Apr 3, 2024
…mplates Generated by code from elastic/logstash#16053
robbavey
added a commit
to elastic/dockerfiles
that referenced
this pull request
Apr 3, 2024
Works around lack of $TARGETARCH variable in Docker build scripts Generated using changes from elastic/logstash#16053
navyau09
pushed a commit
to elastic/dockerfiles
that referenced
this pull request
Apr 4, 2024
Works around lack of $TARGETARCH variable in Docker build scripts Generated using changes from elastic/logstash#16053
jsvd
approved these changes
Apr 4, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor edit, otherwise LGTM
Co-authored-by: João Duarte <[email protected]>
Quality Gate passedKudos, no new issues were introduced! 0 New issues |
💚 Build Succeeded
History
|
@logstashmachine Backport 8.13 |
@logstashmachine backport 8.13 |
github-actions bot
pushed a commit
that referenced
this pull request
Apr 5, 2024
…6053) This commit adds logic to copy the appropriate env2yaml file to the Docker image * Clean up env2yaml folder Co-authored-by: João Duarte <[email protected]> (cherry picked from commit e5b2b3d)
robbavey
added a commit
that referenced
this pull request
Apr 5, 2024
…6053) (#16059) This commit adds logic to copy the appropriate env2yaml file to the Docker image * Clean up env2yaml folder Co-authored-by: João Duarte <[email protected]> (cherry picked from commit e5b2b3d) Co-authored-by: Rob Bavey <[email protected]>
robbavey
added a commit
to robbavey/logstash
that referenced
this pull request
Apr 5, 2024
This commit contains fixes made to the main 8.x branch to generate arm64 and amd64 env2yaml binaries, copy them into the build context and correctly identify the correct binary in the Dockerfile to include in the Docker image. A clean backport was not available due to the change in format of Dockerfile template from j2 to erb in elastic#15142 This contains fixes from elastic#15980 and elastic#16053.
5 tasks
robbavey
added a commit
to robbavey/logstash
that referenced
this pull request
Apr 17, 2024
This commit contains fixes made to the main 8.x branch to generate arm64 and amd64 env2yaml binaries, copy them into the build context and correctly identify the correct binary in the Dockerfile to include in the Docker image. A clean backport was not available due to the change in format of Dockerfile template from j2 to erb in elastic#15142 This contains fixes from elastic#15980 and elastic#16053.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit adds logic to copy the appropriate env2yaml file to the Docker image