[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 <lguohan@gmail.com>
This commit is contained in:
parent
b9f6353714
commit
60b16495cc
@ -54,7 +54,12 @@ RUN apt-get update && \
|
|||||||
libjemalloc1 \
|
libjemalloc1 \
|
||||||
liblua5.1-0 \
|
liblua5.1-0 \
|
||||||
lua-bitop \
|
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
|
# ip and ifconfig utility missing in docker for arm arch
|
||||||
RUN apt-get -y install \
|
RUN apt-get -y install \
|
||||||
|
@ -14,12 +14,8 @@ ENV DEBIAN_FRONTEND=noninteractive
|
|||||||
# Install required packages
|
# Install required packages
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
libdbus-1-3 \
|
|
||||||
libdaemon0 \
|
|
||||||
libjansson4 \
|
|
||||||
libc-ares2 \
|
libc-ares2 \
|
||||||
iproute2 \
|
iproute2 \
|
||||||
libpython2.7 \
|
|
||||||
libjson-c3 \
|
libjson-c3 \
|
||||||
logrotate \
|
logrotate \
|
||||||
libunwind8
|
libunwind8
|
||||||
|
@ -7,20 +7,8 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
|
|||||||
## Make apt-get non-interactive
|
## Make apt-get non-interactive
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -f -y \
|
apt-get install -y ebtables
|
||||||
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 -y install -f kmod
|
RUN apt-get -y install -f kmod
|
||||||
|
|
||||||
COPY \
|
COPY \
|
||||||
|
@ -13,15 +13,6 @@ ENV DEBIAN_FRONTEND=noninteractive
|
|||||||
## TODO: implicitly install dependencies
|
## TODO: implicitly install dependencies
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -f -y \
|
&& apt-get install -f -y \
|
||||||
libdbus-1-3 \
|
|
||||||
libdaemon0 \
|
|
||||||
libjansson4 \
|
|
||||||
libpython2.7 \
|
|
||||||
libatomic1 \
|
|
||||||
libjemalloc1 \
|
|
||||||
liblua5.1-0 \
|
|
||||||
lua-bitop \
|
|
||||||
lua-cjson \
|
|
||||||
libelf1 \
|
libelf1 \
|
||||||
libmnl0 \
|
libmnl0 \
|
||||||
bridge-utils \
|
bridge-utils \
|
||||||
|
@ -11,10 +11,6 @@ RUN apt-get update && \
|
|||||||
apt-get install -f -y \
|
apt-get install -f -y \
|
||||||
ifupdown \
|
ifupdown \
|
||||||
arping \
|
arping \
|
||||||
libdbus-1-3 \
|
|
||||||
libdaemon0 \
|
|
||||||
libjansson4 \
|
|
||||||
libpython2.7 \
|
|
||||||
iproute2 \
|
iproute2 \
|
||||||
ndisc6 \
|
ndisc6 \
|
||||||
tcpdump \
|
tcpdump \
|
||||||
|
@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
|
|||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
python-pip \
|
python-pip \
|
||||||
libpython2.7 \
|
|
||||||
ipmitool \
|
ipmitool \
|
||||||
librrd8 \
|
librrd8 \
|
||||||
librrd-dev \
|
librrd-dev \
|
||||||
|
@ -7,11 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
|
|||||||
## Make apt-get non-interactive
|
## Make apt-get non-interactive
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update
|
||||||
apt-get install -f -y \
|
|
||||||
libdbus-1-3 \
|
|
||||||
libdaemon0 \
|
|
||||||
libjansson4
|
|
||||||
|
|
||||||
{% if docker_sonic_telemetry_debs.strip() -%}
|
{% if docker_sonic_telemetry_debs.strip() -%}
|
||||||
# Copy locally-built Debian package dependencies
|
# Copy locally-built Debian package dependencies
|
||||||
|
@ -7,12 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
|
|||||||
## Make apt-get non-interactive
|
## Make apt-get non-interactive
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update
|
||||||
apt-get install -f -y \
|
|
||||||
libdbus-1-3 \
|
|
||||||
libdaemon0 \
|
|
||||||
libjansson4 \
|
|
||||||
libpython2.7
|
|
||||||
|
|
||||||
{% if docker_teamd_debs.strip() -%}
|
{% if docker_teamd_debs.strip() -%}
|
||||||
# Copy locally-built Debian package dependencies
|
# Copy locally-built Debian package dependencies
|
||||||
|
@ -27,18 +27,10 @@ RUN apt-get install -y net-tools \
|
|||||||
libboost-thread1.62.0 \
|
libboost-thread1.62.0 \
|
||||||
libgmp10 \
|
libgmp10 \
|
||||||
libjudydebian1 \
|
libjudydebian1 \
|
||||||
libdaemon0 \
|
|
||||||
libjansson4 \
|
|
||||||
libatomic1 \
|
|
||||||
libjemalloc1 \
|
|
||||||
liblua5.1-0 \
|
|
||||||
lua-bitop \
|
|
||||||
lua-cjson \
|
|
||||||
openssh-client \
|
openssh-client \
|
||||||
openssh-server \
|
openssh-server \
|
||||||
libc-ares2 \
|
libc-ares2 \
|
||||||
iproute \
|
iproute \
|
||||||
libpython2.7 \
|
|
||||||
grub2-common \
|
grub2-common \
|
||||||
python-click-default-group \
|
python-click-default-group \
|
||||||
python-click \
|
python-click \
|
||||||
|
Reference in New Issue
Block a user