matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Mark many (but not all) of the dockers as Bullseye dockers

Browse Source 
This tells the build infra that they need to be built as part of
Bullseye and not Bookworm.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2023-09-07 17:06:59 -07:00
parent eb75f7252d
commit 01af4e405c
10 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rules/docker-base-bullseye.mk
View File

@ -19,3 +19,4 @@ endif
$(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES += $(GDB) $(GDBSERVER) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE) $(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES += $(GDB) $(GDBSERVER) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
SONIC_DOCKER_IMAGES += $(DOCKER_BASE_BULLSEYE) SONIC_DOCKER_IMAGES += $(DOCKER_BASE_BULLSEYE)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_BASE_BULLSEYE)

1
rules/docker-config-engine-bullseye.mk
View File

@ -27,3 +27,4 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEP
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES)
SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE) SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)

2
rules/docker-database.mk
View File

@ -19,9 +19,11 @@ $(DOCKER_DATABASE)_VERSION = 1.0.0
$(DOCKER_DATABASE)_PACKAGE_NAME = database $(DOCKER_DATABASE)_PACKAGE_NAME = database
SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE) SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_DATABASE)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_DATABASE_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG)
$(DOCKER_DATABASE)_CONTAINER_NAME = database $(DOCKER_DATABASE)_CONTAINER_NAME = database

2
rules/docker-dhcp-relay.mk
View File

@ -31,7 +31,9 @@ $(DOCKER_DHCP_RELAY)_SERVICE_BEFORE = ntp-config
$(DOCKER_DHCP_RELAY)_SERVICE_DEPENDENT_OF = swss $(DOCKER_DHCP_RELAY)_SERVICE_DEPENDENT_OF = swss
SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_DHCP_RELAY)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DHCP_RELAY_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DHCP_RELAY_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_DHCP_RELAY_DBG)
ifeq ($(INCLUDE_KUBERNETES),y) ifeq ($(INCLUDE_KUBERNETES),y)
$(DOCKER_DHCP_RELAY)_DEFAULT_FEATURE_OWNER = kube $(DOCKER_DHCP_RELAY)_DEFAULT_FEATURE_OWNER = kube

2
rules/docker-macsec.mk
View File

@ -18,7 +18,9 @@ $(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3)
$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3)
SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC) SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_MACSEC)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MACSEC_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MACSEC_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MACSEC_DBG)
ifeq ($(INCLUDE_KUBERNETES),y) ifeq ($(INCLUDE_KUBERNETES),y)
$(DOCKER_MACSEC)_DEFAULT_FEATURE_OWNER = kube $(DOCKER_MACSEC)_DEFAULT_FEATURE_OWNER = kube

3
rules/docker-mux.mk
View File

@ -29,6 +29,9 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
endif endif
SONIC_BULLSEYE_DOCKERS += $(DOCKER_MUX)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MUX_DBG)
$(DOCKER_MUX)_CONTAINER_NAME = mux $(DOCKER_MUX)_CONTAINER_NAME = mux
$(DOCKER_MUX)_RUN_OPT += -t $(DOCKER_MUX)_RUN_OPT += -t
$(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

2
rules/docker-orchagent.mk
View File

@ -29,9 +29,11 @@ $(DOCKER_ORCHAGENT)_WARM_SHUTDOWN_BEFORE = syncd
$(DOCKER_ORCHAGENT)_FAST_SHUTDOWN_BEFORE = syncd $(DOCKER_ORCHAGENT)_FAST_SHUTDOWN_BEFORE = syncd
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT) SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_ORCHAGENT)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ORCHAGENT_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
$(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss $(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss

2
rules/docker-p4rt.mk
View File

@ -21,7 +21,9 @@ $(DOCKER_P4RT)_FAST_SHUTDOWN_BEFORE = swss
# TODO: Enable P4RT DBG # TODO: Enable P4RT DBG
SONIC_DOCKER_IMAGES += $(DOCKER_P4RT) SONIC_DOCKER_IMAGES += $(DOCKER_P4RT)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_P4RT)
# SONIC_DOCKER_DBG_IMAGES += $(DOCKER_P4RT_DBG) # SONIC_DOCKER_DBG_IMAGES += $(DOCKER_P4RT_DBG)
# SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_P4RT_DBG)
ifeq ($(INCLUDE_P4RT), y) ifeq ($(INCLUDE_P4RT), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_P4RT) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_P4RT)

3
rules/docker-router-advertiser.mk
View File

@ -28,6 +28,9 @@ ifeq ($(INCLUDE_ROUTER_ADVERTISER), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ROUTER_ADVERTISER_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ROUTER_ADVERTISER_DBG)
endif endif
SONIC_BULLSEYE_DOCKERS += $(DOCKER_ROUTER_ADVERTISER)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ROUTER_ADVERTISER_DBG)
$(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv
$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -t
$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

2
rules/docker-telemetry.mk
View File

@ -18,11 +18,13 @@ $(DOCKER_TELEMETRY)_PACKAGE_NAME = telemetry
$(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES) $(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY) SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_TELEMETRY)
ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y) ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
endif endif
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y) ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
endif endif