From 218b08aa7caac5435ab71d042c3bebbec021ec66 Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Tue, 29 Nov 2016 11:34:46 -0800 Subject: [PATCH] Modify docker_ptf and docker_saiserver_mlnx to use libthrift0.9.3 --- dockers/docker-ptf/Dockerfile | 2 +- dockers/docker-saiserver-mlnx/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile b/dockers/docker-ptf/Dockerfile index cf458af61949..d72391a7ba43 100644 --- a/dockers/docker-ptf/Dockerfile +++ b/dockers/docker-ptf/Dockerfile @@ -37,7 +37,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / cmake \ && dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } \ && dpkg_apt /root/deps/python-ptf_*.deb \ - && dpkg_apt /root/deps/libthrift-0.9.2_*.deb \ + && dpkg_apt /root/deps/libthrift-0.9.3_*.deb \ && dpkg_apt /root/deps/python-thrift_*.deb \ && rm -rf /root/deps \ && apt-get -y autoclean \ diff --git a/dockers/docker-saiserver-mlnx/Dockerfile b/dockers/docker-saiserver-mlnx/Dockerfile index 9390d19e88a0..49f7842c7a41 100755 --- a/dockers/docker-saiserver-mlnx/Dockerfile +++ b/dockers/docker-saiserver-mlnx/Dockerfile @@ -2,7 +2,7 @@ FROM docker-base RUN apt-get update -COPY ["deps/applibs_*.deb", "/deps/applibs-dev_*.deb", "/deps/sx-complib_*.deb", "/deps/sxd-libs_*.deb", "/deps/sx-scew_*.deb", "/deps/sx-examples_*.deb", "/deps/sx-gen-utils_*.deb", "/deps/python-sdk-api_*.deb", "/deps/iproute2_*.deb", "/deps/mlnx-sai_*.deb", "/deps/libthrift-0.9.2_*.deb", "/deps/libnl-3-200_*.deb", "/deps/libnl-genl-3-200_*.deb", "/deps/libnl-route-3-200_*.deb", "/deps/"] +COPY ["deps/applibs_*.deb", "/deps/applibs-dev_*.deb", "/deps/sx-complib_*.deb", "/deps/sxd-libs_*.deb", "/deps/sx-scew_*.deb", "/deps/sx-examples_*.deb", "/deps/sx-gen-utils_*.deb", "/deps/python-sdk-api_*.deb", "/deps/iproute2_*.deb", "/deps/mlnx-sai_*.deb", "/deps/libthrift-0.9.3_*.deb", "/deps/libnl-3-200_*.deb", "/deps/libnl-genl-3-200_*.deb", "/deps/libnl-route-3-200_*.deb", "/deps/"] RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \ dpkg_apt /deps/applibs_*.deb \ @@ -15,7 +15,7 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return && dpkg_apt /deps/python-sdk-api_*.deb \ && dpkg_apt /deps/iproute2_*.deb \ && dpkg_apt /deps/mlnx-sai_*.deb \ - && dpkg_apt /deps/libthrift-0.9.2_*.deb \ + && dpkg_apt /deps/libthrift-0.9.3_*.deb \ && dpkg_apt /deps/libnl-3-200_*.deb \ && dpkg_apt /deps/libnl-genl-3-200_*.deb \ && dpkg_apt /deps/libnl-route-3-200_*.deb