Skip to content

Commit ea2e2db

Browse files
committed
[sonic-swss]: Update submodule
This submodule update brings in the following changes: ``` 50d5be2 Make changes to support compiling on Bullseye with GCC 10 (sonic-net#2216) 0870cf5 [mirrororch]: Implement HW resources availability validation for SPAN/ERSPAN (sonic-net#2187) f4ec565 [vlanmgrd] fix use-after-free memory issue (sonic-net#2211) c2de7fc [QosOrch] The notifications cannot be drained in QosOrch in case the first one needs to retry (sonic-net#2206) 5575935 [neighsyncd] increase neighsyncd timeout (sonic-net#2209) 0f06910 [PBH] Implement Edit Flows (sonic-net#2169) 6241bbf Remove redundant and problematic code to skip "pool" field in buffer profile handling (sonic-net#2197) a55343c [azp]: Set diff coverage threshhold to 80% (sonic-net#2188) 390cae1 [portsorch]: Prevent LAG member configuration when port has active ACL binding (sonic-net#2165) c1d47e6 [VNET]Fixing nexthop group delete during route change (sonic-net#2198) 8941cc0 [BFD]Registering BFD state change callback during session creation (sonic-net#2202) 680c539 [vxlan] Remove tunnel map objects on VNET tunnel removal (sonic-net#2150) 20dde0c Fix for handling broadcom DNX ASIC to have ipv4 and ipv6 ACL rules in separate tables. (sonic-net#2178) 5b7c949 [FdbOrch] SAI_FDB_EVENT_MOVE generates update with empty update.entry.port_name (sonic-net#2200) 7350d49 [Vxlanmgr] vnet netdev cleanup during config reload fix (sonic-net#2191) 2bef62b Validate LAG has members before mirror session create (sonic-net#2130) 1e4d4ce [VS test] Increase VS test time, skip dpb flaky test (sonic-net#2195) 6eda965 [vstest]Migrating vs tests from using click commands to direct DB access (sonic-net#2179) ``` Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent bfe5835 commit ea2e2db

File tree

4 files changed

+46
-1
lines changed

4 files changed

+46
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2+
FROM docker-config-engine-bullseye
3+
4+
## Make apt-get non-interactive
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
7+
RUN apt-get update
8+
9+
{% if docker_swss_layer_bullseye_debs.strip() -%}
10+
# Copy locally-built Debian package dependencies
11+
{{ copy_files("debs/", docker_swss_layer_bullseye_debs.split(' '), "/debs/") }}
12+
13+
# Install locally-built Debian packages and implicitly install their dependencies
14+
{{ install_debian_packages(docker_swss_layer_bullseye_debs.split(' ')) }}
15+
{%- endif %}
16+
17+
RUN apt-get clean -y && \
18+
apt-get autoclean -y && \
19+
apt-get autoremove -y && \
20+
rm -rf /debs
21+
22+
ENTRYPOINT ["/usr/local/bin/supervisord"]

rules/docker-swss-layer-bullseye.dep

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
DPATH := $($(DOCKER_SWSS_LAYER_BULLSEYE)_PATH)
3+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/docker-swss-layer-bullseye.mk rules/docker-swss-layer-bullseye.dep
4+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
5+
DEP_FILES += $(shell git ls-files $(DPATH))
6+
7+
$(DOCKER_SWSS_LAYER_BULLSEYE)_CACHE_MODE := GIT_CONTENT_SHA
8+
$(DOCKER_SWSS_LAYER_BULLSEYE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
9+
$(DOCKER_SWSS_LAYER_BULLSEYE)_DEP_FILES := $(DEP_FILES)
10+

rules/docker-swss-layer-bullseye.mk

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# docker image for sonic swss layer
2+
3+
DOCKER_SWSS_LAYER_BULLSEYE = docker-swss-layer-bullseye.gz
4+
$(DOCKER_SWSS_LAYER_BULLSEYE)_PATH = $(DOCKERS_PATH)/docker-swss-layer-bullseye
5+
6+
$(DOCKER_SWSS_LAYER_BULLSEYE)_DEPENDS += $(SWSS)
7+
$(DOCKER_SWSS_LAYER_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
8+
9+
$(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS) \
10+
$(SWSS)
11+
$(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
12+
13+
SONIC_DOCKER_IMAGES += $(DOCKER_SWSS_LAYER_BULLSEYE)

src/sonic-swss

0 commit comments

Comments
 (0)