[docker-iccpd]: Upgrade docker-iccpd to buster (#4984)
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
This commit is contained in:
Родитель
25c3900085
Коммит
78945766fc
|
@ -1,5 +1,5 @@
|
|||
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
||||
FROM docker-config-engine-stretch
|
||||
FROM docker-config-engine-buster
|
||||
|
||||
ARG docker_container_name
|
||||
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
|
||||
|
|
|
@ -5,18 +5,16 @@ 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_STRETCH)_DBG_DEPENDS)
|
||||
$(DOCKER_ICCPD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
|
||||
$(DOCKER_ICCPD)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) $(ICCPD_DBG)
|
||||
$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
|
||||
$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
|
||||
$(DOCKER_ICCPD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
|
||||
$(DOCKER_ICCPD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
||||
|
||||
ifeq ($(ENABLE_ICCPD), y)
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_ICCPD)
|
||||
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ICCPD)
|
||||
SONIC_STRETCH_DOCKERS += $(DOCKER_ICCPD)
|
||||
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ICCPD_DBG)
|
||||
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ICCPD_DBG)
|
||||
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_ICCPD_DBG)
|
||||
endif
|
||||
|
||||
$(DOCKER_ICCPD)_CONTAINER_NAME = iccpd
|
||||
|
|
Загрузка…
Ссылка в новой задаче