Default build-image target arch to amd64 #11148
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
cstyan
approved these changes
Nov 6, 2023
jeschkies
requested changes
Nov 6, 2023
loki-build-image/Dockerfile
Outdated
| @@ -7,7 +7,7 @@ | |||
|
|
|||
| # Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference. | |||
| FROM golang:1.21.3-bullseye as helm | |||
| ARG TARGETARCH | |||
| ARG TARGETARCH="amd64" | |||
There was a problem hiding this comment.
This would be set by DOCKER_BUILDKIT: 1 which I would favour.
There was a problem hiding this comment.
I'm confused on how this is supposed to work. The Makefile already sets DOCKER_BUILDKIT=1, but running make build-image fails. However, if I run DOCKER_BUILDKIT=1 make build-image it works as you have mentioned.
I just want make build-image to work, I don't care how we get there.
|
@jeschkies I changed how this was done, is 3b8bfc0 a better solution? |
jeschkies
approved these changes
Nov 8, 2023
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
**What this PR does / why we need it**: The changes in grafana#11130 broke `make build-image` and `make build-image-push`. This defaults the target arch added in grafana#11130 so those make targets still work.
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.
What this PR does / why we need it:
The changes in #11130 broke
make build-imageandmake build-image-push. This defaults the target arch added in #11130 so those make targets still work.