Skip to content

Commit 60b1649

Browse files
authored
[docker-base-stretch]: move common packages into docker-base-stretch (#4371)
libpython2.7, libdaemon0, libdbus-1-3, libjansson4 are common across different containers. move them into docker-base-stretch Signed-off-by: Guohan Lu <[email protected]>
1 parent b9f6353 commit 60b1649

File tree

9 files changed

+10
-52
lines changed

9 files changed

+10
-52
lines changed

dockers/docker-base-stretch/Dockerfile.j2

+6-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ RUN apt-get update && \
5454
libjemalloc1 \
5555
liblua5.1-0 \
5656
lua-bitop \
57-
lua-cjson
57+
lua-cjson \
58+
# common dependencies
59+
libpython2.7 \
60+
libdaemon0 \
61+
libdbus-1-3 \
62+
libjansson4
5863

5964
# ip and ifconfig utility missing in docker for arm arch
6065
RUN apt-get -y install \

dockers/docker-fpm-frr/Dockerfile.j2

-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ ENV DEBIAN_FRONTEND=noninteractive
1414
# Install required packages
1515
RUN apt-get update && \
1616
apt-get install -y \
17-
libdbus-1-3 \
18-
libdaemon0 \
19-
libjansson4 \
2017
libc-ares2 \
2118
iproute2 \
22-
libpython2.7 \
2319
libjson-c3 \
2420
logrotate \
2521
libunwind8

dockers/docker-iccpd/Dockerfile.j2

+2-14
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,8 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
77
## Make apt-get non-interactive
88
ENV DEBIAN_FRONTEND=noninteractive
99

10-
RUN apt-get update && \
11-
apt-get install -f -y \
12-
libdbus-1-3 \
13-
libdaemon0 \
14-
libpython2.7 \
15-
# Install redis-tools dependencies
16-
# TODO: implicitly install dependencies
17-
libatomic1 \
18-
libjemalloc1 \
19-
liblua5.1-0 \
20-
lua-bitop \
21-
lua-cjson
22-
23-
RUN apt-get -y install ebtables
10+
RUN apt-get update && \
11+
apt-get install -y ebtables
2412
RUN apt-get -y install -f kmod
2513

2614
COPY \

dockers/docker-nat/Dockerfile.j2

-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ ENV DEBIAN_FRONTEND=noninteractive
1313
## TODO: implicitly install dependencies
1414
RUN apt-get update \
1515
&& apt-get install -f -y \
16-
libdbus-1-3 \
17-
libdaemon0 \
18-
libjansson4 \
19-
libpython2.7 \
20-
libatomic1 \
21-
libjemalloc1 \
22-
liblua5.1-0 \
23-
lua-bitop \
24-
lua-cjson \
2516
libelf1 \
2617
libmnl0 \
2718
bridge-utils \

dockers/docker-orchagent/Dockerfile.j2

-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ RUN apt-get update && \
1111
apt-get install -f -y \
1212
ifupdown \
1313
arping \
14-
libdbus-1-3 \
15-
libdaemon0 \
16-
libjansson4 \
17-
libpython2.7 \
1814
iproute2 \
1915
ndisc6 \
2016
tcpdump \

dockers/docker-platform-monitor/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
1111
RUN apt-get update && \
1212
apt-get install -y \
1313
python-pip \
14-
libpython2.7 \
1514
ipmitool \
1615
librrd8 \
1716
librrd-dev \

dockers/docker-sonic-telemetry/Dockerfile.j2

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
77
## Make apt-get non-interactive
88
ENV DEBIAN_FRONTEND=noninteractive
99

10-
RUN apt-get update && \
11-
apt-get install -f -y \
12-
libdbus-1-3 \
13-
libdaemon0 \
14-
libjansson4
10+
RUN apt-get update
1511

1612
{% if docker_sonic_telemetry_debs.strip() -%}
1713
# Copy locally-built Debian package dependencies

dockers/docker-teamd/Dockerfile.j2

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
77
## Make apt-get non-interactive
88
ENV DEBIAN_FRONTEND=noninteractive
99

10-
RUN apt-get update && \
11-
apt-get install -f -y \
12-
libdbus-1-3 \
13-
libdaemon0 \
14-
libjansson4 \
15-
libpython2.7
10+
RUN apt-get update
1611

1712
{% if docker_teamd_debs.strip() -%}
1813
# Copy locally-built Debian package dependencies

platform/vs/docker-sonic-vs/Dockerfile.j2

-8
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,10 @@ RUN apt-get install -y net-tools \
2727
libboost-thread1.62.0 \
2828
libgmp10 \
2929
libjudydebian1 \
30-
libdaemon0 \
31-
libjansson4 \
32-
libatomic1 \
33-
libjemalloc1 \
34-
liblua5.1-0 \
35-
lua-bitop \
36-
lua-cjson \
3730
openssh-client \
3831
openssh-server \
3932
libc-ares2 \
4033
iproute \
41-
libpython2.7 \
4234
grub2-common \
4335
python-click-default-group \
4436
python-click \

0 commit comments

Comments
 (0)