File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed
platform/broadcom/docker-saiserver-brcm Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change
1
+ {% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
1
2
FROM docker-config-engine-buster
2
3
3
4
ARG docker_container_name
@@ -6,18 +7,20 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
6
7
## Make apt-get non-interactive
7
8
ENV DEBIAN_FRONTEND=noninteractive
8
9
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
10
15
11
16
COPY \
12
17
{% for deb in docker_saiserver_brcm_debs .split (' ' ) -%}
13
18
debs/{{ deb }}{{' '}}
14
19
{% - endfor -%}
15
20
debs/
16
21
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(' ')) }}
21
24
22
25
## TODO: add kmod into Depends
23
26
RUN apt-get install -yf kmod
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ stdout_logfile=syslog
20
20
stderr_logfile=syslog
21
21
22
22
[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
24
24
priority=3
25
25
autostart=false
26
26
autorestart=false
You can’t perform that action at this time.
0 commit comments