bc30528341
Currently, the build dockers are created as a user dockers(docker-base-stretch-<user>, etc) that are specific to each user. But the sonic dockers (docker-database, docker-swss, etc) are created with a fixed docker name and common to all the users. docker-database:latest docker-swss:latest When multiple builds are triggered on the same build server that creates parallel building issue because all the build jobs are trying to create the same docker with latest tag. This happens only when sonic dockers are built using native host dockerd for sonic docker image creation. This patch creates all sonic dockers as user sonic dockers and then, while saving and loading the user sonic dockers, it rename the user sonic dockers into correct sonic dockers with tag as latest. docker-database:latest <== SAVE/LOAD ==> docker-database-<user>:tag The user sonic docker names are derived from 'DOCKER_USERNAME and DOCKER_USERTAG' make env variable and using Jinja template, it replaces the FROM docker name with correct user sonic docker name for loading and saving the docker image.
93 lines
2.1 KiB
Makefile
93 lines
2.1 KiB
Makefile
# SONiC make file
|
|
|
|
NOJESSIE ?= 1
|
|
NOSTRETCH ?= 0
|
|
NOBUSTER ?= 0
|
|
NOBULLSEYE ?= 0
|
|
|
|
ifeq ($(NOJESSIE),0)
|
|
BUILD_JESSIE=1
|
|
endif
|
|
|
|
ifeq ($(NOSTRETCH),0)
|
|
BUILD_STRETCH=1
|
|
endif
|
|
|
|
ifeq ($(NOBUSTER),0)
|
|
BUILD_BUSTER=1
|
|
endif
|
|
|
|
ifeq ($(NOBULLSEYE),0)
|
|
BUILD_BULLSEYE=1
|
|
endif
|
|
|
|
PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
|
|
PLATFORM_CHECKOUT := platform/checkout
|
|
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
|
|
PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
|
|
|
|
%::
|
|
@echo "+++ --- Making $@ --- +++"
|
|
ifeq ($(NOJESSIE), 0)
|
|
EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
|
|
endif
|
|
ifeq ($(NOSTRETCH), 0)
|
|
EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
|
|
endif
|
|
ifeq ($(NOBUSTER), 0)
|
|
EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster make -f Makefile.work buster
|
|
endif
|
|
ifeq ($(NOBULLSEYE), 0)
|
|
BLDENV=bullseye make -f Makefile.work $@
|
|
endif
|
|
BLDENV=bullseye make -f Makefile.work docker-cleanup
|
|
|
|
jessie:
|
|
@echo "+++ Making $@ +++"
|
|
ifeq ($(NOJESSIE), 0)
|
|
make -f Makefile.work jessie
|
|
endif
|
|
|
|
stretch:
|
|
@echo "+++ Making $@ +++"
|
|
ifeq ($(NOSTRETCH), 0)
|
|
make -f Makefile.work stretch
|
|
endif
|
|
|
|
buster:
|
|
@echo "+++ Making $@ +++"
|
|
ifeq ($(NOBUSTER), 0)
|
|
make -f Makefile.work buster
|
|
endif
|
|
|
|
init:
|
|
@echo "+++ Making $@ +++"
|
|
make -f Makefile.work $@
|
|
|
|
#
|
|
# Function to invoke target $@ in Makefile.work with proper BLDENV
|
|
#
|
|
define make_work
|
|
@echo "+++ Making $@ +++"
|
|
$(if $(BUILD_JESSIE),make -f Makefile.work $@,)
|
|
$(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
|
|
$(if $(BUILD_BUSTER),BLDENV=buster make -f Makefile.work $@,)
|
|
$(if $(BUILD_BULLSEYE),BLDENV=bullseye make -f Makefile.work $@,)
|
|
endef
|
|
|
|
.PHONY: $(PLATFORM_PATH)
|
|
|
|
$(PLATFORM_PATH):
|
|
@echo "+++ Cheking $@ +++"
|
|
$(PLATFORM_CHECKOUT_CMD)
|
|
|
|
configure : $(PLATFORM_PATH)
|
|
$(call make_work, $@)
|
|
|
|
clean reset showtag docker-cleanup sonic-slave-build sonic-slave-bash :
|
|
$(call make_work, $@)
|
|
|
|
# Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
|
|
freeze:
|
|
@scripts/versions_manager.py freeze $(FREEZE_VERSION_OPTIONS)
|