From fd733b816eaeca408762b059c33dfa1c4bb78363 Mon Sep 17 00:00:00 2001
From: Adam Yeung <47261130+adyeung@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:38:08 -0700
Subject: [PATCH] ICCPD bookworm migration  (#18542)

ICCPD bookworm migration

* Update Dockerfile.j2
* Update docker-iccpd.mk
---
 dockers/docker-iccpd/Dockerfile.j2 |  2 +-
 rules/docker-iccpd.mk              | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dockers/docker-iccpd/Dockerfile.j2 b/dockers/docker-iccpd/Dockerfile.j2
index 42a73b4cd305..72d2d3d20883 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-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 
diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk
index 3b94dec4257a..39be9f5a53d4 100644
--- a/rules/docker-iccpd.mk
+++ b/rules/docker-iccpd.mk
@@ -4,11 +4,11 @@ DOCKER_ICCPD_STEM = docker-iccpd
 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_BULLSEYE)_DBG_DEPENDS)
-$(DOCKER_ICCPD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) $(ICCPD_DBG)
-$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
-$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
+$(DOCKER_ICCPD)_DEPENDS += $(ICCPD)
+$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS)
+$(DOCKER_ICCPD)_DBG_DEPENDS += $(ICCPD_DBG)
+$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_PACKAGES)
+$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
 
 $(DOCKER_ICCPD)_VERSION = 1.0.0
 $(DOCKER_ICCPD)_ICCPD = iccpd
@@ -27,5 +27,5 @@ $(DOCKER_ICCPD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro
 
 $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl
 
-SONIC_BULLSEYE_DOCKERS += $(DOCKER_ICCPD)
-SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_ICCPD)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)