stepanblyschak · stepanblyschak · Jan 6, 2021
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -337,9 +337,6 @@ start() {
             cp -r /etc/sonic/frr/*.conf /etc/sonic/frr/$DEV
         fi
     fi
-{%- endif %}
-{%- if sonic_asic_platform == "mellanox" %}
-    # TODO: Mellanox will remove the --tmpfs exception after SDK socket path changed in new SDK version
 {%- endif %}
     docker create {{docker_image_run_opt}} \
         --net=$NET \
@@ -357,14 +354,6 @@ start() {
         -v mlnx_sdk_ready:/tmp \
         -v /dev/shm:/dev/shm:rw \
         -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
-{%- elif docker_container_name == "pmon" %}
-        -v /var/run/hw-management:/var/run/hw-management:rw \
-        -v mlnx_sdk_socket:/var/run/sx_sdk \
-        -v mlnx_sdk_ready:/tmp \
-        -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
-        -v /dev/shm:/dev/shm:rw \
-{%- else %}
-        --tmpfs /tmp \
 {%- endif %}
 {%- endif %}
 {%- if sonic_asic_platform == "broadcom" %}
@@ -387,10 +376,6 @@ start() {
 {%- endif %}
         $REDIS_MNT \
         -v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \
-{%- if sonic_asic_platform != "mellanox" %}
-        --tmpfs /tmp \
-{%- endif %}
-        --tmpfs /var/tmp \
         --env "NAMESPACE_ID"="$DEV" \
         --env "NAMESPACE_PREFIX"="$NAMESPACE_PREFIX" \
         --env "NAMESPACE_COUNT"=$NUM_ASIC \

diff --git a/platform/barefoot/docker-syncd-bfn-rpc.mk b/platform/barefoot/docker-syncd-bfn-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_BFN_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk
@@ -14,4 +14,6 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk
@@ -10,6 +10,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_BRCM)
 
 $(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SAISERVER_BRCM)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SAISERVER_BRCM)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/broadcom/docker-syncd-brcm-rpc.mk b/platform/broadcom/docker-syncd-brcm-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_BRCM_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd

diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
@@ -15,6 +15,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh

diff --git a/platform/cavium/docker-syncd-cavm-rpc.mk b/platform/cavium/docker-syncd-cavm-rpc.mk
@@ -18,5 +18,7 @@ endif
 
 $(DOCKER_SYNCD_CAVM_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk
@@ -18,6 +18,8 @@ endif
 
 $(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_CAVM)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/centec-arm64/docker-saiserver-centec.mk b/platform/centec-arm64/docker-saiserver-centec.mk
@@ -9,6 +9,8 @@ SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_CENTEC)
 
 $(DOCKER_SAISERVER_CENTEC)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += --privileged -t
+$(DOCKER_SAISERVER_CENTEC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SAISERVER_CENTEC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/centec-arm64/docker-syncd-centec-rpc.mk b/platform/centec-arm64/docker-syncd-centec-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_CENTEC_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/centec/docker-syncd-centec-rpc.mk b/platform/centec/docker-syncd-centec-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_CENTEC_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/centec/docker-syncd-centec.mk b/platform/centec/docker-syncd-centec.mk
@@ -14,6 +14,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_CENTEC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_CENTEC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/innovium/docker-syncd-invm-rpc.mk b/platform/innovium/docker-syncd-invm-rpc.mk
@@ -11,6 +11,8 @@ endif
 
 $(DOCKER_SYNCD_INVM_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/innovium/docker-syncd-invm.mk b/platform/innovium/docker-syncd-invm.mk
@@ -14,3 +14,5 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
diff --git a/platform/marvell-arm64/docker-saiserver-mrvl.mk b/platform/marvell-arm64/docker-saiserver-mrvl.mk
@@ -9,6 +9,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
 
 $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk b/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/marvell-arm64/docker-syncd-mrvl.mk b/platform/marvell-arm64/docker-syncd-mrvl.mk
@@ -14,4 +14,6 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.mk b/platform/marvell-armhf/docker-saiserver-mrvl.mk
@@ -10,6 +10,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
 
 $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/marvell-armhf/docker-syncd-mrvl.mk b/platform/marvell-armhf/docker-syncd-mrvl.mk
@@ -14,4 +14,6 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/marvell/docker-syncd-mrvl-rpc.mk b/platform/marvell/docker-syncd-mrvl-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/marvell/docker-syncd-mrvl.mk b/platform/marvell/docker-syncd-mrvl.mk
@@ -14,5 +14,7 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/mellanox/docker-saiserver-mlnx.mk b/platform/mellanox/docker-saiserver-mlnx.mk
@@ -10,6 +10,11 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MLNX)
 
 $(DOCKER_SAISERVER_MLNX)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw
+$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v mlnx_sdk_socket:/var/run/sx_sdk
+$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v mlnx_sdk_ready:/tmp
+$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /dev/shm:/dev/shm:rw
+$(DOCKER_SAISERVER_MLNX)_RUN_OPT += -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /run/criu
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc.mk b/platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -21,6 +21,11 @@ endif
 
 $(DOCKER_SYNCD_MLNX_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw
+$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v mlnx_sdk_socket:/var/run/sx_sdk
+$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v mlnx_sdk_ready:/tmp
+$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /dev/shm:/dev/shm:rw
+$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
@@ -15,4 +15,10 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM)
 endif
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v mlnx_sdk_socket:/var/run/sx_sdk
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v mlnx_sdk_ready:/tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /dev/shm:/dev/shm:rw
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock
+
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -32,4 +32,5 @@ $(SYNCD)_RDEPENDS += $(MLNX_SAI)
 # Inject mlnx sdk libs to platform monitor
 $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(APPLIBS) $(SX_COMPLIB) $(SXD_LIBS) $(SX_GEN_UTILS) $(PYTHON_SDK_API) $(APPLIBS_DEV) $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(SX_GEN_UTILS_DEV)
 
+
 export SONIC_BUFFER_MODEL=dynamic
diff --git a/platform/nephos/docker-syncd-nephos-rpc.mk b/platform/nephos/docker-syncd-nephos-rpc.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_SYNCD_NEPHOS_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd

diff --git a/platform/nephos/docker-syncd-nephos.mk b/platform/nephos/docker-syncd-nephos.mk
@@ -15,6 +15,8 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += npx_diag:/usr/bin/npx_diag

diff --git a/platform/vs/docker-gbsyncd-vs.mk b/platform/vs/docker-gbsyncd-vs.mk
@@ -12,3 +12,5 @@ $(DOCKER_GBSYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VS_DBG) \
                                 $(LIBSAIVS_DBG)
 
 $(DOCKER_GBSYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_GBSYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_GBSYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
diff --git a/platform/vs/docker-syncd-vs.mk b/platform/vs/docker-syncd-vs.mk
@@ -12,3 +12,5 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VS_DBG) \
                                 $(LIBSAIVS_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /var/tmp
diff --git a/rules/docker-database.mk b/rules/docker-database.mk
@@ -20,6 +20,8 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG)
 
 $(DOCKER_DATABASE)_CONTAINER_NAME = database
 $(DOCKER_DATABASE)_RUN_OPT += --privileged -t
+$(DOCKER_DATABASE)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_DATABASE)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli

diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
@@ -22,5 +22,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DHCP_RELAY_DBG)
 
 $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay
 $(DOCKER_DHCP_RELAY)_RUN_OPT += --privileged -t
+$(DOCKER_DHCP_RELAY)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_DHCP_RELAY)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_DHCP_RELAY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_DHCP_RELAY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
@@ -22,6 +22,8 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG)
 
 $(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp
 $(DOCKER_FPM_FRR)_RUN_OPT += --privileged -t
+$(DOCKER_FPM_FRR)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_FPM_FRR)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_FPM_FRR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

diff --git a/rules/docker-fpm-gobgp.mk b/rules/docker-fpm-gobgp.mk
@@ -8,5 +8,7 @@ SONIC_DOCKER_IMAGES += $(DOCKER_FPM_GOBGP)
 
 $(DOCKER_FPM_GOBGP)_CONTAINER_NAME = bgp
 $(DOCKER_FPM_GOBGP)_RUN_OPT += --privileged -t
+$(DOCKER_FPM_GOBGP)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_FPM_GOBGP)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_FPM_GOBGP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_FPM_GOBPG)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
diff --git a/rules/docker-fpm-quagga.mk b/rules/docker-fpm-quagga.mk
@@ -8,6 +8,8 @@ SONIC_DOCKER_IMAGES += $(DOCKER_FPM_QUAGGA)
 
 $(DOCKER_FPM_QUAGGA)_CONTAINER_NAME = bgp
 $(DOCKER_FPM_QUAGGA)_RUN_OPT += --privileged -t
+$(DOCKER_FPM_QUAGGA)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_FPM_QUAGGA)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_FPM_QUAGGA)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_FPM_QUAGGA)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk
@@ -19,6 +19,8 @@ endif
 
 $(DOCKER_ICCPD)_CONTAINER_NAME = iccpd
 $(DOCKER_ICCPD)_RUN_OPT += --privileged -t
+$(DOCKER_ICCPD)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_ICCPD)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl
diff --git a/rules/docker-lldp.mk b/rules/docker-lldp.mk
@@ -24,6 +24,8 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_LLDP_DBG)
 
 $(DOCKER_LLDP)_CONTAINER_NAME = lldp
 $(DOCKER_LLDP)_RUN_OPT += --privileged -t
+$(DOCKER_LLDP)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_LLDP)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_LLDP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl

diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk
@@ -25,6 +25,8 @@ endif
 
 $(DOCKER_NAT)_CONTAINER_NAME = nat
 $(DOCKER_NAT)_RUN_OPT += --privileged -t
+$(DOCKER_NAT)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_NAT)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_NAT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_NAT)_RUN_OPT += -v /host/warmboot:/var/warmboot
 

diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk
@@ -25,6 +25,8 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
 
 $(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss
 $(DOCKER_ORCHAGENT)_RUN_OPT += --privileged -t
+$(DOCKER_ORCHAGENT)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_ORCHAGENT)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
 $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
 $(DOCKER_ORCHAGENT)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro

diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
@@ -44,6 +44,17 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG)
 
 $(DOCKER_PLATFORM_MONITOR)_CONTAINER_NAME = pmon
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --privileged -t
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --tmpfs /var/tmp
+ifneq ($(CONFIGURED_PLATFORM),mellanox)
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --tmpfs /tmp
+else
+# Custom pmon run options required for communication with SDK process
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/hw-management:/var/run/hw-management:rw
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v mlnx_sdk_socket:/var/run/sx_sdk
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v mlnx_sdk_ready:/tmp
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock
+$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /dev/shm:/dev/shm:rw
+endif
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platform_cache:ro
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro

diff --git a/rules/docker-restapi.mk b/rules/docker-restapi.mk
@@ -18,6 +18,8 @@ endif
 
 $(DOCKER_RESTAPI)_CONTAINER_NAME = restapi
 $(DOCKER_RESTAPI)_RUN_OPT += --cap-add NET_ADMIN --privileged -t
+$(DOCKER_RESTAPI)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_RESTAPI)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_RESTAPI)_RUN_OPT += -v /var/run/redis/redis.sock:/var/run/redis/redis.sock
 $(DOCKER_RESTAPI)_RUN_OPT += -v /etc/sonic/credentials:/etc/sonic/credentials:ro
 $(DOCKER_RESTAPI)_RUN_OPT += -p=8081:8081/tcp

diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk
@@ -21,5 +21,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ROUTER_ADVERTISER_DBG)
 
 $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv
 $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --privileged -t
+$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --tmpfs /tmp
+$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --tmpfs /var/tmp
 $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,5 @@ $(SYNCD)_RDEPENDS += $(MLNX_SAI)
		# Inject mlnx sdk libs to platform monitor
		$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(APPLIBS) $(SX_COMPLIB) $(SXD_LIBS) $(SX_GEN_UTILS) $(PYTHON_SDK_API) $(APPLIBS_DEV) $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(SX_GEN_UTILS_DEV)


		export SONIC_BUFFER_MODEL=dynamic