Skip to content

Commit 2078dfb

Browse files
oleksandrivantsivqiluo-msft
authored andcommitted
Added libteam5 package to orchagent docker to resolve instalation dependencies. (#62)
1 parent 1e113a4 commit 2078dfb

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MLNX-SDK-DEBS=$(notdir $(wildcard src/mlnx-sdk/*.deb))
1515
BRCM-SDK-DEBS=$(notdir $(wildcard src/brcm-sdk/*.deb))
1616
CAVM-SDK-DEBS=$(notdir $(wildcard src/cavm-sdk/*.deb))
1717

18-
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
18+
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
1919
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
2020

2121
## Function: build_docker, image_name save_file
@@ -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 $(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)
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) $(LIBTEAM-DEBS) teamsyncd)
137137
docker load < $<
138138
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
139139

dockers/docker-orchagent/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ FROM docker-base
22

33
RUN apt-get update
44

5-
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/"]
5+
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/"]
66

77
RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \
88
dpkg_apt /deps/libhiredis0.13*.deb \
99
&& dpkg_apt /deps/libnl-3-200_*.deb \
1010
&& dpkg_apt /deps/libnl-genl-3-200_*.deb \
1111
&& dpkg_apt /deps/libnl-route-3-200_*.deb \
12+
&& dpkg_apt /deps/libnl-nf-3-200_*.deb \
13+
&& dpkg_apt /deps/libnl-cli-3-200_*.deb \
1214
&& dpkg_apt /deps/libswsscommon_*.deb \
1315
&& dpkg_apt /deps/libsairedis_*.deb \
14-
&& dpkg_apt /deps/libsaimetadata_*.deb \
16+
&& dpkg_apt /deps/libsaimetadata_*.deb \
17+
&& dpkg_apt /deps/libteam5_*.deb \
1518
&& dpkg_apt /deps/swss_*.deb
1619

1720
RUN apt-get install -f -y ifupdown bridge-utils redis-tools

0 commit comments

Comments
 (0)