From f8524e74f5a582455d5fdfbb88776a2276a00e37 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 11 Nov 2016 12:09:25 -0800 Subject: [PATCH] Fix dependencies in Dockerfiles (#65) --- Makefile | 2 +- dockers/docker-fpm/Dockerfile | 13 ++++++++----- dockers/docker-syncd-cavm/Dockerfile | 21 ++++++++++++--------- dockers/docker-team/Dockerfile | 5 +---- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 528d483ddc35..f106a96137e9 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ target/docker-orchagent-cavm.gz: target/docker-base.gz $(addprefix dockers/docke docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) -target/docker-fpm.gz: target/docker-base.gz $(addprefix dockers/docker-fpm/deps/,libswsscommon_1.0.0_amd64.deb libhiredis0.13_0.13.3-2_amd64.deb quagga_0.99.24.1-2.1_amd64.deb fpmsyncd) +target/docker-fpm.gz: target/docker-base.gz $(addprefix dockers/docker-fpm/deps/,libswsscommon_1.0.0_amd64.deb libhiredis0.13_0.13.3-2_amd64.deb quagga_0.99.24.1-2.1_amd64.deb fpmsyncd $(LIBNL-DEBS)) docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) diff --git a/dockers/docker-fpm/Dockerfile b/dockers/docker-fpm/Dockerfile index 287aba29ec82..ca5b811f1949 100755 --- a/dockers/docker-fpm/Dockerfile +++ b/dockers/docker-fpm/Dockerfile @@ -2,14 +2,17 @@ FROM docker-base RUN apt-get update -COPY ["deps/libhiredis0.13*.deb", "deps/libswsscommon_*.deb", "deps/quagga_*", "/deps/"] +COPY ["deps/libhiredis0.13*.deb", "deps/libnl-3-200_*.deb", "deps/libnl-genl-3-200_*.deb", "deps/libnl-route-3-200_*.deb", "deps/libswsscommon_*.deb", "deps/quagga_*", "/deps/"] ## Get fpmsyncd -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /deps/libhiredis0.13*.deb -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /deps/libswsscommon_*.deb - ## Get Quagga -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /deps/quagga_*.deb +RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \ + dpkg_apt /deps/libhiredis0.13*.deb \ + && dpkg_apt /deps/libnl-3-200_*.deb \ + && dpkg_apt /deps/libnl-genl-3-200_*.deb \ + && dpkg_apt /deps/libnl-route-3-200_*.deb \ + && dpkg_apt /deps/libswsscommon_*.deb \ + && dpkg_apt /deps/quagga_*.deb COPY ["deps/fpmsyncd", "start.sh", "/usr/bin/"] diff --git a/dockers/docker-syncd-cavm/Dockerfile b/dockers/docker-syncd-cavm/Dockerfile index 3fdbf1f516b8..e8025011bb70 100755 --- a/dockers/docker-syncd-cavm/Dockerfile +++ b/dockers/docker-syncd-cavm/Dockerfile @@ -2,17 +2,20 @@ FROM docker-base RUN apt-get update -COPY ["deps/libhiredis0.13*.deb", "deps/libswsscommon_*.deb", "deps/libsairedis_*.deb", "deps/libsaimetadata_*.deb", "deps/syncd_*.deb", "deps/sai*.deb", "deps/libsai*.deb", "deps/xp-tools*.deb", "deps/xpshell*.deb", "/deps/"] +COPY ["deps/libhiredis0.13*.deb", "deps/libnl-3-200_*.deb", "deps/libnl-genl-3-200_*.deb", "deps/libnl-route-3-200_*.deb", "deps/libswsscommon_*.deb", "deps/libsairedis_*.deb", "deps/libsaimetadata_*.deb", "deps/syncd_*.deb", "deps/sai*.deb", "deps/libsai*.deb", "deps/xp-tools*.deb", "deps/xpshell*.deb", "/deps/"] RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \ - dpkg_apt /deps/libhiredis0.13*.deb \ - && dpkg_apt /deps/libswsscommon_*.deb \ - && dpkg_apt /deps/sai*.deb \ - && dpkg_apt /deps/libsai*.deb \ - && dpkg_apt /deps/xp-tools*.deb \ - && dpkg_apt /deps/xpshell*.deb \ - && dpkg_apt /deps/libsairedis_*.deb \ - && dpkg_apt /deps/libsaimetadata_*.deb\ + dpkg_apt /deps/libhiredis0.13*.deb \ + && dpkg_apt /deps/libnl-3-200_*.deb \ + && dpkg_apt /deps/libnl-genl-3-200_*.deb \ + && dpkg_apt /deps/libnl-route-3-200_*.deb \ + && dpkg_apt /deps/libswsscommon_*.deb \ + && dpkg_apt /deps/sai*.deb \ + && dpkg_apt /deps/libsai*.deb \ + && dpkg_apt /deps/xp-tools*.deb \ + && dpkg_apt /deps/xpshell*.deb \ + && dpkg_apt /deps/libsairedis_*.deb \ + && dpkg_apt /deps/libsaimetadata_*.deb \ && dpkg_apt /deps/syncd_*.deb RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev diff --git a/dockers/docker-team/Dockerfile b/dockers/docker-team/Dockerfile index 345b671c7d56..607a990b4f23 100644 --- a/dockers/docker-team/Dockerfile +++ b/dockers/docker-team/Dockerfile @@ -1,7 +1,6 @@ FROM docker-base -COPY ["deps/libnl-3-200_*.deb", "deps/libnl-genl-3-200_*.deb", "deps/libnl-route-3-200_*.deb", "deps/libnl-nf-3-200_*.deb", "deps/libnl-cli-3-200_*.deb", "deps/libteam5_*.deb", "deps/libteam-dev_*.deb", "deps/libteam-utils_*.deb", "deps/libteamdctl0_*.deb", "deps/libhiredis0.13_*.deb", "deps/libswsscommon_*.deb", "/deps/"] - +COPY ["deps/libnl-3-200_*.deb", "deps/libnl-genl-3-200_*.deb", "deps/libnl-route-3-200_*.deb", "deps/libnl-nf-3-200_*.deb", "deps/libnl-cli-3-200_*.deb", "deps/libteam5_*.deb", "deps/libteam-utils_*.deb", "deps/libteamdctl0_*.deb", "deps/libhiredis0.13_*.deb", "deps/libswsscommon_*.deb", "/deps/"] RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \ dpkg_apt /deps/libnl-3-200_*.deb \ @@ -12,7 +11,6 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return && dpkg_apt /deps/libteam5_*.deb \ && dpkg_apt /deps/libteam-utils_*.deb \ && dpkg_apt /deps/libteamdctl0_*.deb \ - && dpkg_apt /deps/libteam-dev_*.deb \ && dpkg_apt /deps/libhiredis0.13_*.deb \ && dpkg_apt /deps/libswsscommon_*.deb @@ -23,4 +21,3 @@ RUN rm -rf /deps ENTRYPOINT ["/bin/bash"] CMD ["/usr/bin/start.sh"] -