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.

Sign up for GitHub

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

Default build-image target arch to amd64 #11148

Merged
merged 5 commits into from
Nov 8, 2023
Merged

Default build-image target arch to amd64 #11148

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4052a2
Default build-image target arch to amd64
trevorwhitney Nov 6, 2023
1a35bc3
Default TARGETOS as well
trevorwhitney Nov 6, 2023
da5c80f
Revert "Default TARGETOS as well"
trevorwhitney Nov 6, 2023
439327e
Revert "Default build-image target arch to amd64"
trevorwhitney Nov 6, 2023
3b8bfc0
explicitly set DOCKER_BUILDKIT
trevorwhitney Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
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