Skip to content

Commit

Permalink
Default build-image target arch to amd64 (grafana#11148)
Browse files Browse the repository at this point in the history
**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.
  • Loading branch information
trevorwhitney authored and rhnasc committed Apr 12, 2024
1 parent 878c519 commit 7658df3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ RM := --rm
# in any custom cloudbuild.yaml files
TTY := --tty

DOCKER_BUILDKIT=1
DOCKER_BUILDKIT ?= 1
BUILD_IMAGE = BUILD_IMAGE=$(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION)
PUSH_OCI=docker push
TAG_OCI=docker tag
ifeq ($(CI), true)
OCI_PLATFORMS=--platform=linux/amd64,linux/arm64
BUILD_OCI=docker buildx build $(OCI_PLATFORMS) --build-arg $(BUILD_IMAGE)
BUILD_OCI=DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build $(OCI_PLATFORMS) --build-arg $(BUILD_IMAGE)
else
BUILD_OCI=docker build --build-arg $(BUILD_IMAGE)
BUILD_OCI=DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker build --build-arg $(BUILD_IMAGE)
endif

binfmt:
Expand Down

0 comments on commit 7658df3

Please sign in to comment.