Skip to content

Commit b73f9a5

Browse files
lguohanlguohan
authored
[swss]: update swss docker to stretch (sonic-net#2714)
* [swss]: update swss docker to stretch sonic-swss update: * aa92326 2019-03-29 | fix c++ 11 build complaint for destructors default to noexcept (sonic-net#822) (HEAD, origin/master, origin/HEAD) [lguohan] * a304007 2019-03-28 | Allow ACL entry creation without ACL counter (sonic-net#818) [Wenda Ni] * 60a8a0d 2019-03-28 | [orchagent]: Cast enum class variable to int (sonic-net#819) (HEAD, origin/master, origin/HEAD) [Shuotian Cheng] * 3dd37a4 2019-03-26 | [vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET implementation (sonic-net#816) [Volodymyr Samotiy] * a937f92 2019-03-22 | [VS]: fix occasional test_fdb_notifications vs test failure (sonic-net#813) [Jipan Yang] * ea54825 2019-03-21 | [portsorch] Fix inconsistent return value in bindAclTable (sonic-net#791) [yorke] * 5984e3a 2019-03-07 | Fix orchagent SEGV when PortConfigDone not set (sonic-net#803) [Ramesh Santhanakrishnan] Signed-off-by: Guohan Lu <[email protected]>
1 parent 9c83b54 commit b73f9a5

File tree

9 files changed

+24
-17
lines changed

9 files changed

+24
-17
lines changed

‎dockers/docker-orchagent/Dockerfile.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine
1+
FROM docker-config-engine-stretch
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN apt-get update
1010

11-
RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7
11+
RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7 iproute2
1212

1313
RUN apt-get install -f -y ndisc6 tcpdump python-scapy
1414
## Install redis-tools dependencies

‎platform/barefoot/docker-orchagent-bfn.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_BFN = docker-orchagent-bfn.gz
44
$(DOCKER_ORCHAGENT_BFN)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_BFN)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
1415

1516
$(DOCKER_ORCHAGENT_BFN)_CONTAINER_NAME = swss

‎platform/broadcom/docker-orchagent-brcm.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_BRCM = docker-orchagent-brcm.gz
44
$(DOCKER_ORCHAGENT_BRCM)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_BRCM)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
1415

1516
$(DOCKER_ORCHAGENT_BRCM)_CONTAINER_NAME = swss

‎platform/cavium/docker-orchagent-cavm.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_CAVM = docker-orchagent-cavm.gz
44
$(DOCKER_ORCHAGENT_CAVM)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_CAVM)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
1415

1516
$(DOCKER_ORCHAGENT_CAVM)_CONTAINER_NAME = swss

‎platform/centec/docker-orchagent-centec.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_CENTEC = docker-orchagent-centec.gz
44
$(DOCKER_ORCHAGENT_CENTEC)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_CENTEC)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
1415

1516
$(DOCKER_ORCHAGENT_CENTEC)_CONTAINER_NAME = swss

‎platform/marvell/docker-orchagent-mrvl.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_MRVL = docker-orchagent-mrvl.gz
44
$(DOCKER_ORCHAGENT_MRVL)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_MRVL)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
1415

1516
$(DOCKER_ORCHAGENT_MRVL)_CONTAINER_NAME = swss

‎platform/mellanox/docker-orchagent-mlnx.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_MLNX = docker-orchagent-mlnx.gz
44
$(DOCKER_ORCHAGENT_MLNX)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_MLNX)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
1415

1516
$(DOCKER_ORCHAGENT_MLNX)_CONTAINER_NAME = swss

‎platform/vs/docker-orchagent-vs.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
DOCKER_ORCHAGENT_VS = docker-orchagent-vs.gz
44
$(DOCKER_ORCHAGENT_VS)_PATH = $(DOCKERS_PATH)/docker-orchagent
5-
$(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
5+
$(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
66
ifeq ($(INSTALL_DEBUG_TOOLS), y)
77
$(DOCKER_ORCHAGENT_VS)_DEPENDS += $(SWSS_DBG) \
88
$(LIBSWSSCOMMON_DBG) \
99
$(LIBSAIREDIS_DBG)
1010
endif
11-
$(DOCKER_ORCHAGENT_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
11+
$(DOCKER_ORCHAGENT_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
1212
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_VS)
13+
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT_VS)
1314
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_VS)
1415

1516
$(DOCKER_ORCHAGENT_VS)_CONTAINER_NAME = swss

‎src/sonic-swss

0 commit comments

Comments
 (0)