From 231473ab9da0580922f4a423a4207727cc15b40e Mon Sep 17 00:00:00 2001 From: Mayank Shah Date: Fri, 30 Oct 2020 15:40:44 +0530 Subject: [PATCH 1/2] CI: Add workflow for pushing ARM image Signed-off-by: Mayank Shah --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index fcf39e68e6c..10050ddd46a 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,7 @@ smb-container: ifdef CI make smb smb-windows docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-linux-amd64 -f ./pkg/smbplugin/Dockerfile --platform="linux/amd64" --push . + docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-linux-arm64 -f ./pkg/smbplugin/Dockerfile --platform="linux/arm64" --push . docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-windows-1809-amd64 -f ./pkg/smbplugin/Windows.Dockerfile --platform="windows/amd64" --push . docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)-linux-amd64 $(IMAGE_TAG)-windows-1809-amd64 docker manifest inspect $(IMAGE_TAG) From 5d75575ced7a422b3cdaa83f1983993cef0cbe92 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 9 Nov 2020 11:37:34 +0000 Subject: [PATCH 2/2] feat: add arm64 support --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 10050ddd46a..a779ba45f58 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,10 @@ smb-windows: smb-darwin: CGO_ENABLED=0 GOOS=darwin go build -a -ldflags ${LDFLAGS} -o _output/smbplugin ./pkg/smbplugin +.PHONY: smb-arm64 +smb-arm64: + CGO_ENABLED=0 GOARCH=arm64 go build -a -ldflags ${LDFLAGS} -o _output/smbplugin ./pkg/smbplugin + .PHONY: container container: smb docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/smbplugin/dev.Dockerfile . @@ -114,14 +118,17 @@ smb-container: docker buildx rm container-builder || true docker buildx create --use --name=container-builder ifdef CI - make smb smb-windows + make smb docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-linux-amd64 -f ./pkg/smbplugin/Dockerfile --platform="linux/amd64" --push . + make smb-arm64 + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-linux-arm64 -f ./pkg/smbplugin/Dockerfile --platform="linux/arm64" --push . + make smb-windows docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG)-windows-1809-amd64 -f ./pkg/smbplugin/Windows.Dockerfile --platform="windows/amd64" --push . - docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)-linux-amd64 $(IMAGE_TAG)-windows-1809-amd64 + docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)-linux-amd64 $(IMAGE_TAG)-linux-arm64 $(IMAGE_TAG)-windows-1809-amd64 docker manifest inspect $(IMAGE_TAG) ifdef PUBLISH - docker manifest create $(IMAGE_TAG_LATEST) $(IMAGE_TAG)-linux-amd64 $(IMAGE_TAG)-windows-1809-amd64 + docker manifest create $(IMAGE_TAG_LATEST) $(IMAGE_TAG)-linux-amd64 $(IMAGE_TAG)-linux-arm64 $(IMAGE_TAG)-windows-1809-amd64 docker manifest inspect $(IMAGE_TAG_LATEST) endif else