Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Apr 5, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa9decd
[docker-base-stretch]: move common packages into docker-base-stretch
lguohan Apr 5, 2020
0f057f9
fix bug
lguohan Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dockers/docker-base-stretch/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions dockers/docker-fpm-frr/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 2 additions & 14 deletions dockers/docker-iccpd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 0 additions & 9 deletions dockers/docker-nat/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions dockers/docker-orchagent/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion dockers/docker-platform-monitor/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
python-pip \
libpython2.7 \
ipmitool \
librrd8 \
librrd-dev \
Expand Down
6 changes: 1 addition & 5 deletions dockers/docker-sonic-telemetry/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions dockers/docker-teamd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions platform/vs/docker-sonic-vs/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down