Skip to content

Commit e2e57d3

Browse files
lguohanqiluo-msft
authored andcommitted
[docker-orchagent]: upgrade docker-orchagent to buster (sonic-net#4889)
also update submodule * 01f810f 2020-07-02 | fix compiling issue for gcc8.3 (sonic-net#1339) [lguohan] * 9b13120 2020-07-03 | Fix in script to avoid orchagent crash when port down followed by fdb delete (sonic-net#1340) [rupesh-k] * 9b01844 2020-07-01 | [qosorch] Update QoS scheduler params for shaping features (sonic-net#1296) [Michael Li] * 86b5e99 2020-07-02 | [mirrororch] Port Mirroring implementation (sonic-net#1314) [rupesh-k] * c05601c 2020-06-24 | [portsyncd]: add debug message if a port cannot be found in port able (sonic-net#1328) [lguohan] * a0b6412 2020-06-23 | COPP_DEL_fix: DEL for one trap group from SONIC is resetting all the trap IDs (sonic-net#1273) [SinghMinu] Signed-off-by: Guohan Lu <[email protected]>
1 parent 856f117 commit e2e57d3

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

dockers/docker-orchagent/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
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-stretch
2+
FROM docker-config-engine-buster
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-orchagent.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,21 @@ DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz
66

77
$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS)
88

9-
$(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
9+
$(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
1010
$(DOCKER_ORCHAGENT)_DBG_DEPENDS += $(SWSS_DBG) \
1111
$(LIBSWSSCOMMON_DBG) \
1212
$(LIBSAIREDIS_DBG)
1313

14-
$(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
14+
$(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
1515

1616
$(DOCKER_ORCHAGENT)_PATH = $(DOCKERS_PATH)/$(DOCKER_ORCHAGENT_STEM)
1717

18-
$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
18+
$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
1919

2020
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
21-
SONIC_STRETCH_DOCKERS += $(DOCKER_ORCHAGENT)
2221
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
2322

2423
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
25-
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_ORCHAGENT_DBG)
2624
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
2725

2826
$(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss

src/sonic-swss

0 commit comments

Comments
 (0)