Skip to content

Commit 7d0570c

Browse files
authored
[Mellanox]Take advantage of sdk variable to customize the location where sdk_socket exists. (#4223)
Take advantage of an SDK environment variable to customize the location where sdk_socket exists. In the latest SDK sdk_socket has been moved from /tmp to /var/run which is a better place to contain this kind of file. However, this prevents the subdirs under /var/run from being mapped to different volumes. To resolve this, we take advantage of an SDK variable to designate the location of sdk_socket. This requires every process that requires to access sdk_socket have this environment variable defined. However, to define environment variable for each process is less scalable. We take advantage of the docker scope environment variable to avoid that. It depends on PR 4227
1 parent be549db commit 7d0570c

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

files/build_templates/docker_image_ctl.j2

+6-2
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,15 @@ start() {
201201
{%- if sonic_asic_platform == "mellanox" %}
202202
{%- if docker_container_name == "syncd" %}
203203
-v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw \
204-
-v mlnx_sdk_socket:/tmp \
204+
-v mlnx_sdk_socket:/var/run/sx_sdk \
205+
-v mlnx_sdk_ready:/tmp \
205206
-v /dev/shm:/dev/shm:rw \
207+
-e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
206208
{%- elif docker_container_name == "pmon" %}
207209
-v /var/run/hw-management:/var/run/hw-management:rw \
208-
-v mlnx_sdk_socket:/tmp \
210+
-v mlnx_sdk_socket:/var/run/sx_sdk \
211+
-v mlnx_sdk_ready:/tmp \
212+
-e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
209213
-v /dev/shm:/dev/shm:rw \
210214
{%- else %}
211215
--tmpfs /tmp \

platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ FROM docker-syncd-mlnx
44
## Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive
66

7+
RUN mkdir -p /var/run/sx_sdk
8+
79
RUN apt-get purge -y syncd
810

911
{% if docker_syncd_mlnx_rpc_debs.strip() -%}

platform/mellanox/docker-syncd-mlnx/Dockerfile.j2

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ FROM docker-config-engine-stretch
44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
66

7+
RUN mkdir -p /var/run/sx_sdk
8+
79
## Make apt-get non-interactive
810
ENV DEBIAN_FRONTEND=noninteractive
911

0 commit comments

Comments
 (0)