Skip to content

Commit 80c1210

Browse files
authored
iccpd bullseye migration (#12097)
1 parent 1073a47 commit 80c1210

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

dockers/docker-iccpd/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

rules/docker-iccpd.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ DOCKER_ICCPD = $(DOCKER_ICCPD_STEM).gz
55
DOCKER_ICCPD_DBG = $(DOCKER_ICCPD_STEM)-$(DBG_IMAGE_MARK).gz
66
$(DOCKER_ICCPD)_PATH = $(DOCKERS_PATH)/$(DOCKER_ICCPD_STEM)
77
$(DOCKER_ICCPD)_DEPENDS += $(SWSS) $(ICCPD)
8-
$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
8+
$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
99
$(DOCKER_ICCPD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) $(ICCPD_DBG)
10-
$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
11-
$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
10+
$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
11+
$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
1212

1313
$(DOCKER_ICCPD)_VERSION = 1.0.0
1414
$(DOCKER_ICCPD)_ICCPD = iccpd
@@ -26,5 +26,5 @@ $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
2626

2727
$(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl
2828

29-
SONIC_BUSTER_DOCKERS += $(DOCKER_ICCPD)
30-
SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)
29+
SONIC_BULLSEYE_DOCKERS += $(DOCKER_ICCPD)
30+
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)

0 commit comments

Comments
 (0)