parent
8326812b1a
commit
03e1d3e7ad
2
Makefile
2
Makefile
|
|
@ -154,7 +154,7 @@ container-linux-armv7:
|
||||||
container-windows:
|
container-windows:
|
||||||
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \
|
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \
|
||||||
-t $(IMAGE_TAG)-windows-$(OSVERSION)-$(ARCH) --build-arg OSVERSION=$(OSVERSION) \
|
-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
|
.PHONY: container-all
|
||||||
container-all: smb-windows
|
container-all: smb-windows
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ az acr build -r $acrName -t $acrRepo:$ver-$linux -f cmd/smbplugin/Dockerfile --
|
||||||
|
|
||||||
win="windows-1809-amd64"
|
win="windows-1809-amd64"
|
||||||
make smb-windows
|
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 create $acrRepo:$ver $acrRepo:$ver-$linux $acrRepo:$ver-$win
|
||||||
docker manifest inspect $acrRepo:$ver
|
docker manifest inspect $acrRepo:$ver
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue