From dff2b99325279ba46f22f6a79d05fa3e60ca5a9c Mon Sep 17 00:00:00 2001 From: Yilun Date: Tue, 14 May 2024 17:37:01 -0700 Subject: [PATCH] fix make docker not building amd64 image when running on arm Signed-off-by: Yilun --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fcdcd8b41..e239771be 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ test: .PHONY: docker docker: - docker build -f docker/Dockerfile -t nknorg/nkn:latest-amd64 . + docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=amd64 BUILD_DIR=. BIN_DIR=." --build-arg base="amd64/" -t nknorg/nkn:latest-amd64 . docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm GOARM=6 BUILD_DIR=. BIN_DIR=." --build-arg base="arm32v6/" -t nknorg/nkn:latest-arm32v6 . docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm64 BUILD_DIR=. BIN_DIR=." --build-arg base="arm64v8/" -t nknorg/nkn:latest-arm64v8 . @@ -111,6 +111,7 @@ docker_publish: docker push nknorg/nkn:latest-arm32v6 docker push nknorg/nkn:latest-arm64v8 DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create nknorg/nkn:latest nknorg/nkn:latest-amd64 nknorg/nkn:latest-arm32v6 nknorg/nkn:latest-arm64v8 --amend + DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-amd64 --os linux --arch amd64 DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm32v6 --os linux --arch arm DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm64v8 --os linux --arch arm64 DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push -p nknorg/nkn:latest