matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[docker-base-stretch]: move common packages into docker-base-stretch (#4371)

Browse Source 
libpython2.7, libdaemon0, libdbus-1-3, libjansson4 are common
across different containers. move them into docker-base-stretch

Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
lguohan 2020-04-05 13:29:34 -07:00 committed by GitHub
parent b9f6353714
commit 60b16495cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockers/docker-base-stretch/Dockerfile.j2
View File

@ -54,7 +54,12 @@ RUN apt-get update && \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson
lua-cjson \
# common dependencies
libpython2.7 \
libdaemon0 \
libdbus-1-3 \
libjansson4
# ip and ifconfig utility missing in docker for arm arch
RUN apt-get -y install \

4
dockers/docker-fpm-frr/Dockerfile.j2
View File

@ -14,12 +14,8 @@ ENV DEBIAN_FRONTEND=noninteractive
# Install required packages
RUN apt-get update && \
apt-get install -y \
libdbus-1-3 \
libdaemon0 \
libjansson4 \
libc-ares2 \
iproute2 \
libpython2.7 \
libjson-c3 \
logrotate \
libunwind8

16
dockers/docker-iccpd/Dockerfile.j2
View File

@ -7,20 +7,8 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -f -y \
libdbus-1-3 \
libdaemon0 \
libpython2.7 \
# Install redis-tools dependencies
# TODO: implicitly install dependencies
libatomic1 \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson
RUN apt-get -y install ebtables
RUN apt-get update && \
apt-get install -y ebtables
RUN apt-get -y install -f kmod
COPY \

9
dockers/docker-nat/Dockerfile.j2
View File

@ -13,15 +13,6 @@ ENV DEBIAN_FRONTEND=noninteractive
## TODO: implicitly install dependencies
RUN apt-get update \
&& apt-get install -f -y \
libdbus-1-3 \
libdaemon0 \
libjansson4 \
libpython2.7 \
libatomic1 \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson \
libelf1 \
libmnl0 \
bridge-utils \

4
dockers/docker-orchagent/Dockerfile.j2
View File

@ -11,10 +11,6 @@ RUN apt-get update && \
apt-get install -f -y \
ifupdown \
arping \
libdbus-1-3 \
libdaemon0 \
libjansson4 \
libpython2.7 \
iproute2 \
ndisc6 \
tcpdump \

1
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
python-pip \
libpython2.7 \
ipmitool \
librrd8 \
librrd-dev \

6
dockers/docker-sonic-telemetry/Dockerfile.j2
View File

@ -7,11 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -f -y \
libdbus-1-3 \
libdaemon0 \
libjansson4
RUN apt-get update
{% if docker_sonic_telemetry_debs.strip() -%}
# Copy locally-built Debian package dependencies

7
dockers/docker-teamd/Dockerfile.j2
View File

@ -7,12 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -f -y \
libdbus-1-3 \
libdaemon0 \
libjansson4 \
libpython2.7
RUN apt-get update
{% if docker_teamd_debs.strip() -%}
# Copy locally-built Debian package dependencies

8
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -27,18 +27,10 @@ RUN apt-get install -y net-tools \
libboost-thread1.62.0 \
libgmp10 \
libjudydebian1 \
libdaemon0 \
libjansson4 \
libatomic1 \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson \
openssh-client \
openssh-server \
libc-ares2 \
iproute \
libpython2.7 \
grub2-common \
python-click-default-group \
python-click \