From d93b3aaac12a59fc96217f69069d8fb22aa10aeb Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Wed, 3 Apr 2019 12:41:29 -0700 Subject: [PATCH 1/2] Fix scapy crash problem with debian python-scapy (2.4.0-2) Signed-off-by: Jipan Yang --- dockers/docker-base-stretch/sources.list | 1 + dockers/docker-orchagent/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dockers/docker-base-stretch/sources.list b/dockers/docker-base-stretch/sources.list index b1ce507a44f5..5211d04af47f 100644 --- a/dockers/docker-base-stretch/sources.list +++ b/dockers/docker-base-stretch/sources.list @@ -6,3 +6,4 @@ deb-src http://debian-archive.trafficmanager.net/debian/ stretch main contrib no deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free deb-src http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free deb http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free +deb http://debian-archive.trafficmanager.net/debian/ unstable main contrib non-free \ No newline at end of file diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2 index 05ef95991504..534816a72d47 100755 --- a/dockers/docker-orchagent/Dockerfile.j2 +++ b/dockers/docker-orchagent/Dockerfile.j2 @@ -10,7 +10,7 @@ RUN apt-get update RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7 iproute2 -RUN apt-get install -f -y ndisc6 tcpdump python-scapy +RUN apt-get install -f -y ndisc6 tcpdump python-scapy=2.4.0-2 ## Install redis-tools dependencies ## TODO: implicitly install dependencies RUN apt-get -y install libjemalloc1 From d54abd7c7e0bdb01d512c363e2564a39e4553c2f Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Thu, 4 Apr 2019 11:27:36 -0700 Subject: [PATCH 2/2] Switch to pip for scap 2.4.2 install Signed-off-by: Jipan Yang --- dockers/docker-base-stretch/sources.list | 1 - dockers/docker-orchagent/Dockerfile.j2 | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/docker-base-stretch/sources.list b/dockers/docker-base-stretch/sources.list index 5211d04af47f..b1ce507a44f5 100644 --- a/dockers/docker-base-stretch/sources.list +++ b/dockers/docker-base-stretch/sources.list @@ -6,4 +6,3 @@ deb-src http://debian-archive.trafficmanager.net/debian/ stretch main contrib no deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free deb-src http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free deb http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free -deb http://debian-archive.trafficmanager.net/debian/ unstable main contrib non-free \ No newline at end of file diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2 index 534816a72d47..d29ea6a8905a 100755 --- a/dockers/docker-orchagent/Dockerfile.j2 +++ b/dockers/docker-orchagent/Dockerfile.j2 @@ -10,14 +10,15 @@ RUN apt-get update RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7 iproute2 -RUN apt-get install -f -y ndisc6 tcpdump python-scapy=2.4.0-2 +RUN apt-get install -f -y ndisc6 tcpdump +RUN pip install scapy==2.4.2 ## Install redis-tools dependencies ## TODO: implicitly install dependencies RUN apt-get -y install libjemalloc1 RUN apt-get install -y libelf1 libmnl0 bridge-utils -RUN pip install setuptools +RUN pip install setuptools RUN pip install pyroute2==0.5.3 netifaces==0.10.7 RUN pip install monotonic==1.5