Skip to content

Commit 06b9d3a

Browse files
richardyu-msqiluo-msft
authored andcommitted
[202012][saiserver docker]adds saiserver dependences (#8447)
Co-authored-by: richardyu-ms <[email protected]>
1 parent 01117d5 commit 06b9d3a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

platform/broadcom/docker-saiserver-brcm/Dockerfile.j2

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
12
FROM docker-config-engine-buster
23

34
ARG docker_container_name
@@ -6,18 +7,20 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
67
## Make apt-get non-interactive
78
ENV DEBIAN_FRONTEND=noninteractive
89

9-
RUN apt-get update
10+
## Pre-install the fundamental packages
11+
RUN apt-get update \
12+
&& apt-get -y install \
13+
gdb \
14+
libboost-atomic1.71.0
1015

1116
COPY \
1217
{% for deb in docker_saiserver_brcm_debs.split(' ') -%}
1318
debs/{{ deb }}{{' '}}
1419
{%- endfor -%}
1520
debs/
1621

17-
RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
18-
{% for deb in docker_saiserver_brcm_debs.split(' ') -%}
19-
dpkg_apt debs/{{ deb }}{{'; '}}
20-
{%- endfor %}
22+
# Install locally-built Debian packages and implicitly install their dependencies
23+
{{ install_debian_packages(docker_saiserver_brcm_debs.split(' ')) }}
2124

2225
## TODO: add kmod into Depends
2326
RUN apt-get install -yf kmod

platform/broadcom/docker-saiserver-brcm/supervisord.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ stdout_logfile=syslog
2020
stderr_logfile=syslog
2121

2222
[program:saiserver]
23-
command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
23+
command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
2424
priority=3
2525
autostart=false
2626
autorestart=false

0 commit comments

Comments
 (0)