Skip to content

Commit

Permalink
Set DOCKER_DEFAULT_PLATFORM for make control-plane-dev-docker so that…
Browse files Browse the repository at this point in the history
… M1/arm64machines do not have failures in k8s due to manifest reflecting arm64 architecture rather than amd64. (#1074)
  • Loading branch information
jmurret authored Mar 4, 2022
1 parent ac150a9 commit 84406a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ control-plane-dev: ## Build consul-k8s-control-plane binary.

control-plane-dev-docker: ## Build consul-k8s-control-plane dev Docker image.
@$(SHELL) $(CURDIR)/control-plane/build-support/scripts/build-local.sh -o linux -a amd64
@docker build -t '$(DEV_IMAGE)' \
@DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build -t '$(DEV_IMAGE)' \
--build-arg 'GIT_COMMIT=$(GIT_COMMIT)' \
--build-arg 'GIT_DIRTY=$(GIT_DIRTY)' \
--build-arg 'GIT_DESCRIBE=$(GIT_DESCRIBE)' \
Expand Down

0 comments on commit 84406a9

Please sign in to comment.