diff --git a/Makefile.work b/Makefile.work index b849c435f11..d499af25fee 100644 --- a/Makefile.work +++ b/Makefile.work @@ -433,7 +433,7 @@ DOCKER_SLAVE_BASE_BUILD = docker build --no-cache \ $(SPLIT_LOG) $(DOCKER_BASE_LOG) DOCKER_BASE_PULL = docker pull \ - $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) + $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) DOCKER_USER_BUILD = docker build --no-cache \ --build-arg user=$(USER) \ @@ -459,7 +459,7 @@ DOCKER_SLAVE_BASE_PULL_REGISTRY = \ $(DOCKER_BASE_PULL); \ } && \ { \ - docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ + docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ $(COLLECT_DOCKER); \ }\ diff --git a/rules/config b/rules/config index 4507667d4ad..71064d0d2b9 100644 --- a/rules/config +++ b/rules/config @@ -264,6 +264,7 @@ SONIC_VERSION_CACHE_SOURCE ?= $(SONIC_DPKG_CACHE_SOURCE)/vcache # Set the env variable ENABLE_DOCKER_BASE_PULL = y to enable pulling sonic-slave docker from registry REGISTRY_PORT ?= 443 REGISTRY_SERVER ?= sonicdev-microsoft.azurecr.io +REGISTRY_SERVER_PATH ?= # BUILD_MULTIASIC_KVM - if set to y multi-asic KVM images will be generated. BUILD_MULTIASIC_KVM = n