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

Move Docker build context artifacts to architecture specific locations #16052

Closed
wants to merge 3 commits into from

Conversation

robbavey
Copy link
Member

@robbavey robbavey commented Apr 2, 2024

This commit moves the Docker build context artifacts under architecture specific folders, and removes the TARGETARCH specifier introduced in #15980

This follows the guidelines for multi-architecture public Dockerfiles in https://github.com/docker-library/official-images?tab=readme-ov-file#multiple-architectures.

@robbavey robbavey changed the title Move artifacts to architecture specific locations Move Docker build context artifacts to architecture specific locations Apr 2, 2024
@robbavey
Copy link
Member Author

robbavey commented Apr 2, 2024

To test, run rake artifacts:docker, and rake artifacts:dockerfiles, verify that the docker build contexts contain the correct artifacts for each architecture.

Docker images created can also be run and verifed

Exhaustive Builds:

https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/361
https://buildkite.com/elastic/logstash-aarch64-pipeline/builds/84

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

ARG TARGETARCH
COPY env2yaml/env2yaml-${TARGETARCH} /usr/local/bin/env2yaml

COPY env2yaml/env2yaml /usr/local/bin/env2yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

You probably have a phantom env2yaml file that was built a long time ago, so you are able to build the image.
Delete that file and rebuild everything should give env2yaml-amd64 and env2yaml-arm64 only

@robbavey
Copy link
Member Author

robbavey commented Apr 3, 2024

Closing this in favor of #16053

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants