Skip to content

Commit

Permalink
Merge pull request #470 from andyzhangx/win-build-pipeline
Browse files Browse the repository at this point in the history
chore: fix Windows build in build pipeline
  • Loading branch information
andyzhangx authored May 1, 2022
2 parents 8326812 + 03e1d3e commit 912ddfd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/smbplugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 912ddfd

Please sign in to comment.