From 2b9c3994533f0f71f6b9728bba037b345a3e407a Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Fri, 4 Nov 2016 19:03:14 +0200 Subject: [PATCH] Fix issue with team docker build. Added required docker-team dependency to Makefile to copy dep packages to dockers/docker-team/deps/ directory. Changed order of deb packages installation to fix dependency issue. --- Makefile | 2 +- dockers/docker-team/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01ac0f96942e..3af2d859096c 100644 --- a/Makefile +++ b/Makefile @@ -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 $(LIBTEAM-DEBS)) +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) docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) diff --git a/dockers/docker-team/Dockerfile b/dockers/docker-team/Dockerfile index 885b99674b85..345b671c7d56 100644 --- a/dockers/docker-team/Dockerfile +++ b/dockers/docker-team/Dockerfile @@ -10,9 +10,9 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return && dpkg_apt /deps/libnl-nf-3-200_*.deb \ && dpkg_apt /deps/libnl-cli-3-200_*.deb \ && dpkg_apt /deps/libteam5_*.deb \ - && dpkg_apt /deps/libteam-dev_*.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