From e3ebe000519d98e796f6005560b6918b77c7700d Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 7 Sep 2023 17:06:59 -0700 Subject: [PATCH] Mark many (but not all) of the dockers as Bullseye dockers This tells the build infra that they need to be built as part of Bullseye and not Bookworm. Signed-off-by: Saikrishna Arcot --- rules/docker-base-bullseye.mk | 1 + rules/docker-config-engine-bullseye.mk | 1 + rules/docker-database.mk | 2 ++ rules/docker-dhcp-relay.mk | 2 ++ rules/docker-gnmi.mk | 2 ++ rules/docker-macsec.mk | 2 ++ rules/docker-mux.mk | 3 +++ rules/docker-orchagent.mk | 2 ++ rules/docker-p4rt.mk | 2 ++ rules/docker-router-advertiser.mk | 3 +++ rules/docker-telemetry.mk | 2 ++ 11 files changed, 22 insertions(+) diff --git a/rules/docker-base-bullseye.mk b/rules/docker-base-bullseye.mk index df2d964a4f..7ca2067196 100644 --- a/rules/docker-base-bullseye.mk +++ b/rules/docker-base-bullseye.mk @@ -19,3 +19,4 @@ endif $(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES += $(GDB) $(GDBSERVER) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE) SONIC_DOCKER_IMAGES += $(DOCKER_BASE_BULLSEYE) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_BASE_BULLSEYE) diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk index 25d73d846d..aa91a56279 100644 --- a/rules/docker-config-engine-bullseye.mk +++ b/rules/docker-config-engine-bullseye.mk @@ -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) SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) diff --git a/rules/docker-database.mk b/rules/docker-database.mk index a10609933c..888031a7b7 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -19,9 +19,11 @@ $(DOCKER_DATABASE)_VERSION = 1.0.0 $(DOCKER_DATABASE)_PACKAGE_NAME = database SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_DATABASE) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_DATABASE_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) $(DOCKER_DATABASE)_CONTAINER_NAME = database diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 6e2e5d5434..1224eb5d9e 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -31,7 +31,9 @@ $(DOCKER_DHCP_RELAY)_SERVICE_BEFORE = ntp-config $(DOCKER_DHCP_RELAY)_SERVICE_DEPENDENT_OF = swss SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_DHCP_RELAY) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DHCP_RELAY_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_DHCP_RELAY_DBG) ifeq ($(INCLUDE_KUBERNETES),y) $(DOCKER_DHCP_RELAY)_DEFAULT_FEATURE_OWNER = kube diff --git a/rules/docker-gnmi.mk b/rules/docker-gnmi.mk index f0b47676da..43cb7be2f7 100644 --- a/rules/docker-gnmi.mk +++ b/rules/docker-gnmi.mk @@ -18,11 +18,13 @@ $(DOCKER_GNMI)_PACKAGE_NAME = gnmi $(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES) SONIC_DOCKER_IMAGES += $(DOCKER_GNMI) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_GNMI) ifeq ($(INCLUDE_SYSTEM_GNMI), y) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI) endif SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_GNMI_DBG) ifeq ($(INCLUDE_SYSTEM_GNMI), y) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG) endif diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk index bb85a65b4f..acadbea64b 100644 --- a/rules/docker-macsec.mk +++ b/rules/docker-macsec.mk @@ -18,7 +18,9 @@ $(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3) $(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_MACSEC) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MACSEC_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MACSEC_DBG) ifeq ($(INCLUDE_KUBERNETES),y) $(DOCKER_MACSEC)_DEFAULT_FEATURE_OWNER = kube diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk index 3af7baa004..fae8d21788 100644 --- a/rules/docker-mux.mk +++ b/rules/docker-mux.mk @@ -29,6 +29,9 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG) endif +SONIC_BULLSEYE_DOCKERS += $(DOCKER_MUX) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MUX_DBG) + $(DOCKER_MUX)_CONTAINER_NAME = mux $(DOCKER_MUX)_RUN_OPT += -t $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk index 1e877aef4b..0560c280a2 100644 --- a/rules/docker-orchagent.mk +++ b/rules/docker-orchagent.mk @@ -29,9 +29,11 @@ $(DOCKER_ORCHAGENT)_WARM_SHUTDOWN_BEFORE = syncd $(DOCKER_ORCHAGENT)_FAST_SHUTDOWN_BEFORE = syncd SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_ORCHAGENT) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ORCHAGENT_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) $(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss diff --git a/rules/docker-p4rt.mk b/rules/docker-p4rt.mk index 865bf9fee8..d34447b0ee 100644 --- a/rules/docker-p4rt.mk +++ b/rules/docker-p4rt.mk @@ -21,7 +21,9 @@ $(DOCKER_P4RT)_FAST_SHUTDOWN_BEFORE = swss # TODO: Enable P4RT DBG SONIC_DOCKER_IMAGES += $(DOCKER_P4RT) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_P4RT) # SONIC_DOCKER_DBG_IMAGES += $(DOCKER_P4RT_DBG) +# SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_P4RT_DBG) ifeq ($(INCLUDE_P4RT), y) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_P4RT) diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index a565fd8ad1..f7dec2430a 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -28,6 +28,9 @@ ifeq ($(INCLUDE_ROUTER_ADVERTISER), y) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ROUTER_ADVERTISER_DBG) endif +SONIC_BULLSEYE_DOCKERS += $(DOCKER_ROUTER_ADVERTISER) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ROUTER_ADVERTISER_DBG) + $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index 59743b6cbc..8f2324080c 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -16,11 +16,13 @@ $(DOCKER_TELEMETRY)_PACKAGE_NAME = telemetry $(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_GNMI)_DBG_IMAGE_PACKAGES) SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_TELEMETRY) ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY) endif SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG) ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG) endif