Skip to content

Commit 817671d

Browse files
oleksandrivantsivqiluo-msft
authored andcommitted
Fix issue with team docker build (#59)
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.
1 parent a583bff commit 817671d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ target/docker-fpm.gz: target/docker-base.gz $(addprefix dockers/docker-fpm/deps/
133133
docker load < $<
134134
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
135135

136-
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))
136+
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)
137137
docker load < $<
138138
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
139139

dockers/docker-team/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return
1010
&& dpkg_apt /deps/libnl-nf-3-200_*.deb \
1111
&& dpkg_apt /deps/libnl-cli-3-200_*.deb \
1212
&& dpkg_apt /deps/libteam5_*.deb \
13-
&& dpkg_apt /deps/libteam-dev_*.deb \
1413
&& dpkg_apt /deps/libteam-utils_*.deb \
1514
&& dpkg_apt /deps/libteamdctl0_*.deb \
15+
&& dpkg_apt /deps/libteam-dev_*.deb \
1616
&& dpkg_apt /deps/libhiredis0.13_*.deb \
1717
&& dpkg_apt /deps/libswsscommon_*.deb
1818

0 commit comments

Comments
 (0)