From f1861bd3b3e4b5e5692621f3f43aba7c98127820 Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Mon, 7 Nov 2016 12:04:58 +0200 Subject: [PATCH] Added libteam5 package to orchagent docker to resolve instalation dependencies. --- Makefile | 4 ++-- dockers/docker-orchagent/Dockerfile | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3af2d859096c..87465c04562a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ MLNX-SDK-DEBS=$(notdir $(wildcard src/mlnx-sdk/*.deb)) BRCM-SDK-DEBS=$(notdir $(wildcard src/brcm-sdk/*.deb)) CAVM-SDK-DEBS=$(notdir $(wildcard src/cavm-sdk/*.deb)) -LIBNL-DEBS=libnl-3-200_3.2.27-1_amd64.deb libnl-genl-3-200_3.2.27-1_amd64.deb libnl-route-3-200_3.2.27-1_amd64.deb +LIBNL-DEBS=libnl-3-200_3.2.27-1_amd64.deb libnl-genl-3-200_3.2.27-1_amd64.deb libnl-route-3-200_3.2.27-1_amd64.deb libnl-cli-3-200_3.2.27-1_amd64.deb libnl-nf-3-200_3.2.27-1_amd64.deb LIBTEAM-DEBS=libteam5_1.26-1_amd64.deb libteam-dev_1.26-1_amd64.deb libteam-utils_1.26-1_amd64.deb libteamdctl0_1.26-1_amd64.deb ## Function: build_docker, image_name save_file @@ -133,7 +133,7 @@ target/docker-fpm.gz: target/docker-base.gz $(addprefix dockers/docker-fpm/deps/ docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) -target/docker-team.gz: target/docker-base.gz $(addprefix dockers/docker-team/deps/,libswsscommon_1.0.0_amd64.deb libhiredis0.13_0.13.3-2_amd64.deb $(LIBNL-DEBS) libnl-cli-3-200_3.2.27-1_amd64.deb libnl-nf-3-200_3.2.27-1_amd64.deb $(LIBTEAM-DEBS) teamsyncd) +target/docker-team.gz: target/docker-base.gz $(addprefix dockers/docker-team/deps/,libswsscommon_1.0.0_amd64.deb libhiredis0.13_0.13.3-2_amd64.deb $(LIBNL-DEBS) $(LIBTEAM-DEBS) teamsyncd) docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) diff --git a/dockers/docker-orchagent/Dockerfile b/dockers/docker-orchagent/Dockerfile index 311fba152a64..cc95cf0f7f0b 100755 --- a/dockers/docker-orchagent/Dockerfile +++ b/dockers/docker-orchagent/Dockerfile @@ -2,16 +2,19 @@ FROM docker-base RUN apt-get update -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/swss_*.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/libnl-cli-3-200_*.deb", "deps/libnl-nf-3-200_*.deb", "deps/libswsscommon_*.deb", "deps/libsairedis_*.deb", "deps/libsaimetadata_*.deb", "deps/libteam5_*.deb", "deps/swss_*.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/libnl-3-200_*.deb \ && dpkg_apt /deps/libnl-genl-3-200_*.deb \ && dpkg_apt /deps/libnl-route-3-200_*.deb \ + && dpkg_apt /deps/libnl-nf-3-200_*.deb \ + && dpkg_apt /deps/libnl-cli-3-200_*.deb \ && dpkg_apt /deps/libswsscommon_*.deb \ && dpkg_apt /deps/libsairedis_*.deb \ - && dpkg_apt /deps/libsaimetadata_*.deb \ + && dpkg_apt /deps/libsaimetadata_*.deb \ + && dpkg_apt /deps/libteam5_*.deb \ && dpkg_apt /deps/swss_*.deb RUN apt-get install -f -y ifupdown bridge-utils redis-tools