separate conflist for Windows & Linux (#94)
This commit is contained in:
Родитель
c97b593a57
Коммит
0ddedd86d6
2
Makefile
2
Makefile
|
@ -151,7 +151,7 @@ publish-azure-vnet-plugin-image:
|
||||||
# Create a CNI archive for the target platform.
|
# Create a CNI archive for the target platform.
|
||||||
.PHONY: cni-archive
|
.PHONY: cni-archive
|
||||||
cni-archive:
|
cni-archive:
|
||||||
cp cni/azure.conflist $(CNI_BUILD_DIR)/10-azure.conflist
|
cp cni/azure-$(GOOS).conflist $(CNI_BUILD_DIR)/10-azure-$(GOOS).conflist
|
||||||
chmod 0755 $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
|
chmod 0755 $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
|
||||||
cd $(CNI_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
|
cd $(CNI_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
|
||||||
chown $(BUILD_USER):$(BUILD_USER) $(CNI_BUILD_DIR)/$(CNI_ARCHIVE_NAME)
|
chown $(BUILD_USER):$(BUILD_USER) $(CNI_BUILD_DIR)/$(CNI_ARCHIVE_NAME)
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"cniVersion": "0.3.0",
|
||||||
|
"name": "azure",
|
||||||
|
"plugins": [{
|
||||||
|
"type": "azure-vnet",
|
||||||
|
"mode": "bridge",
|
||||||
|
"bridge": "azure0",
|
||||||
|
"ipam": {
|
||||||
|
"type": "azure-vnet-ipam"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Загрузка…
Ссылка в новой задаче