feat: Build docker dev images for specified platform (#2493)

Previously, building this target on an ARM machine would
produce an image with a amd64 binary inside an arm
OS.
This commit is contained in:
Johan Brandhorst-Satzkorn authored and GitHub committed 2022-09-26 11:39:13 -04:00
1 parent 4493dfd527
commit da9adb0c02
2 files changed
+4 -3

No files matched your search

+4 -1
View File
@@ -332,11 +332,14 @@ DEV_DOCKER_GOARCH ?= amd64
docker-build-dev: export GOOS=$(DEV_DOCKER_GOOS)
docker-build-dev: export GOARCH=$(DEV_DOCKER_GOARCH)
docker-build-dev: build
docker build \
docker buildx build \
--load \
--platform $(DEV_DOCKER_GOOS)/$(DEV_DOCKER_GOARCH) \
--tag $(IMAGE_TAG_DEV) \
--target=dev \
--build-arg=boundary \
.
@echo "Successfully built $(IMAGE_TAG_DEV)"
.NOTPARALLEL:
-2
View File
@@ -15,8 +15,6 @@ dockerfiles = $(wildcard Dockerfile.*)
docker-buildxs = $(patsubst Dockerfile.%,%-buildx, $(dockerfiles))
docker-load-buildxs = $(patsubst Dockerfile.%,%-load-buildx, $(dockerfiles))
# Before running this target a builder instance needs to be setup, ie:
# docker buildx create --driver docker-container --use
docker-build: ${docker-buildxs}
${docker-buildxs}: %-buildx: