From 31811db9aeee33ab2eae64759fb1be16e25f0674 Mon Sep 17 00:00:00 2001
From: Adam Yeung <47261130+adyeung@users.noreply.github.com>
Date: Thu, 6 Oct 2022 11:28:53 -0700
Subject: [PATCH] iccpd bullseye migration (#12097)

---
 dockers/docker-iccpd/Dockerfile.j2 |  2 +-
 rules/docker-iccpd.mk              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dockers/docker-iccpd/Dockerfile.j2 b/dockers/docker-iccpd/Dockerfile.j2
index 95a55159e4..bdb0a9fbf3 100644
--- a/dockers/docker-iccpd/Dockerfile.j2
+++ b/dockers/docker-iccpd/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk
index c0c7479979..eb58ee755c 100644
--- a/rules/docker-iccpd.mk
+++ b/rules/docker-iccpd.mk
@@ -5,10 +5,10 @@ DOCKER_ICCPD = $(DOCKER_ICCPD_STEM).gz
 DOCKER_ICCPD_DBG = $(DOCKER_ICCPD_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_ICCPD)_PATH = $(DOCKERS_PATH)/$(DOCKER_ICCPD_STEM)
 $(DOCKER_ICCPD)_DEPENDS += $(SWSS) $(ICCPD)
-$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
 $(DOCKER_ICCPD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) $(ICCPD_DBG)
-$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
-$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
+$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
 
 $(DOCKER_ICCPD)_VERSION = 1.0.0
 $(DOCKER_ICCPD)_ICCPD = iccpd
@@ -26,5 +26,5 @@ $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl
 
-SONIC_BUSTER_DOCKERS += $(DOCKER_ICCPD)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_ICCPD)
+SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)