91
91
92
92
include rules/config
93
93
94
+ ifeq ($(ENABLE_DOCKER_BASE_PULL),)
95
+ override ENABLE_DOCKER_BASE_PULL = n
96
+ endif
97
+
94
98
ifeq ($(CONFIGURED_ARCH),amd64)
95
99
SLAVE_BASE_IMAGE = $(SLAVE_DIR)
96
100
else
@@ -194,6 +198,9 @@ DOCKER_BASE_BUILD = docker build --no-cache \
194
198
--build-arg https_proxy=$(https_proxy) \
195
199
$(SLAVE_DIR)
196
200
201
+ DOCKER_BASE_PULL = docker pull \
202
+ $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
203
+
197
204
DOCKER_BUILD = docker build --no-cache \
198
205
--build-arg user=$(USER) \
199
206
--build-arg uid=$(shell id -u) \
@@ -258,9 +265,13 @@ endif
258
265
@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
259
266
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
260
267
@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
268
+ { [ $(ENABLE_DOCKER_BASE_PULL) == y ] && { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Pulling...; } && \
269
+ $(DOCKER_BASE_PULL) && \
270
+ { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
271
+ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \
261
272
{ echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
262
- $(DOCKER_BASE_BUILD) ; \
263
- scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
273
+ $(DOCKER_BASE_BUILD) ; \
274
+ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
264
275
@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
265
276
{ echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
266
277
$(DOCKER_BUILD) ; }
@@ -282,9 +293,13 @@ sonic-slave-base-build : sonic-build-hooks
282
293
@$(OVERLAY_MODULE_CHECK)
283
294
@echo Checking sonic-slave-base image: $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
284
295
@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
296
+ { [ $(ENABLE_DOCKER_BASE_PULL) == y ] && { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Pulling...; } && \
297
+ $(DOCKER_BASE_PULL) && \
298
+ { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
299
+ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \
285
300
{ echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
286
- $(DOCKER_BASE_BUILD) ; \
287
- scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
301
+ $(DOCKER_BASE_BUILD) ; \
302
+ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
288
303
289
304
sonic-slave-build : sonic-slave-base-build
290
305
@echo Checking sonic-slave image: $(SLAVE_IMAGE):$(SLAVE_TAG)
0 commit comments