Skip to content

Commit e6bb4b2

Browse files
author
Shuotian Cheng
authored
[swss]: Update submodules and mount /var/log to swss docker (#636)
- [swss]: Update sairedis/swss/common submodules - [orchagent]: Mount /var/log folder and use the folder to save recording files - [orchagent]: Use -d to specify the folder path
1 parent f3312b8 commit e6bb4b2

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed

dockers/docker-orchagent/orchagent.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ HWSKU=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
44

55
MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'`
66

7-
ORCHAGENT_ARGS=""
7+
# Create a folder for SsWW record files
8+
mkdir -p /var/log/swss
9+
ORCHAGENT_ARGS="-d /var/log/swss "
810

911
if [ "$HWSKU" == "Force10-S6000" ]; then
1012
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"

platform/broadcom/docker-orchagent-brcm.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $(DOCKER_ORCHAGENT_BRCM)_CONTAINER_NAME = swss
1111
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += --net=host --privileged -t
1212
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
1313
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
14-
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
14+
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
1515
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
16+
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /var/log:/var/log:rw
1617

1718
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel

platform/cavium/docker-orchagent-cavm.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $(DOCKER_ORCHAGENT_CAVM)_CONTAINER_NAME = swss
1111
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += --net=host --privileged -t
1212
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
1313
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
14-
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
14+
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
1515
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
16+
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /var/log:/var/log:rw
1617

1718
$(DOCKER_ORCHAGENT_CAVM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel

platform/centec/docker-orchagent-centec.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $(DOCKER_ORCHAGENT_CENTEC)_CONTAINER_NAME = swss
1111
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += --net=host --privileged -t
1212
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
1313
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
14-
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
14+
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
1515
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
16+
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /var/log:/var/log:rw
1617

1718
$(DOCKER_ORCHAGENT_CENTEC)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel

platform/mellanox/docker-orchagent-mlnx.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $(DOCKER_ORCHAGENT_MLNX)_CONTAINER_NAME = swss
1111
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += --net=host --privileged -t
1212
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
1313
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
14-
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
14+
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
1515
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
16+
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /var/log:/var/log:rw
1617

1718
$(DOCKER_ORCHAGENT_MLNX)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel

src/sonic-sairedis

src/sonic-swss

src/sonic-swss-common

0 commit comments

Comments
 (0)