Skip to content
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
merged 4 commits into from
Apr 4, 2024

Conversation

robbavey
Copy link
Member

@robbavey robbavey commented Apr 2, 2024

This commit adds logic to copy the appropriate env2yaml file to the Docker image

robbavey added 2 commits April 2, 2024 13:04
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
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
@jsvd jsvd self-requested a review April 3, 2024 17:14
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
Copy link
Member

@jsvd jsvd left a 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

docker/templates/Dockerfile.erb Outdated Show resolved Hide resolved
Copy link

Quality Gate passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No Coverage information No data about Coverage
No Duplication information No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

@robbavey robbavey merged commit e5b2b3d into elastic:main Apr 4, 2024
6 checks passed
@robbavey
Copy link
Member Author

robbavey commented Apr 4, 2024

@logstashmachine Backport 8.13

@robbavey
Copy link
Member Author

robbavey commented Apr 5, 2024

@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.
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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants