From 03e1d3e7ad788e92f15f2db2ec663787e6481b65 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 1 May 2022 14:41:49 +0000 Subject: [PATCH] chore: fix Windows build in build pipeline fix --- Makefile | 2 +- cmd/smbplugin/{Windows.Dockerfile => Dockerfile.Windows} | 0 cmd/smbplugin/README.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename cmd/smbplugin/{Windows.Dockerfile => Dockerfile.Windows} (100%) diff --git a/Makefile b/Makefile index 69c962ba39a..f5c5eb5f519 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ container-linux-armv7: container-windows: docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \ -t $(IMAGE_TAG)-windows-$(OSVERSION)-$(ARCH) --build-arg OSVERSION=$(OSVERSION) \ - --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Windows.Dockerfile . + --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Dockerfile.Windows . .PHONY: container-all container-all: smb-windows diff --git a/cmd/smbplugin/Windows.Dockerfile b/cmd/smbplugin/Dockerfile.Windows similarity index 100% rename from cmd/smbplugin/Windows.Dockerfile rename to cmd/smbplugin/Dockerfile.Windows diff --git a/cmd/smbplugin/README.md b/cmd/smbplugin/README.md index b3ace05272d..6b8990a68fb 100644 --- a/cmd/smbplugin/README.md +++ b/cmd/smbplugin/README.md @@ -15,7 +15,7 @@ az acr build -r $acrName -t $acrRepo:$ver-$linux -f cmd/smbplugin/Dockerfile -- win="windows-1809-amd64" make smb-windows -az acr build -r $acrName -t $acrRepo:$ver-$win -f cmd/smbplugin/Windows.Dockerfile --platform windows . +az acr build -r $acrName -t $acrRepo:$ver-$win -f cmd/smbplugin/Dockerfile.Windows --platform windows . docker manifest create $acrRepo:$ver $acrRepo:$ver-$linux $acrRepo:$ver-$win docker manifest inspect $acrRepo:$ver