From 182a809dc3addb18549e6b17d62a46413166fbfb Mon Sep 17 00:00:00 2001 From: zhenggen-xu Date: Tue, 15 Dec 2020 11:06:30 -0800 Subject: [PATCH] [docker-vs][docker-orchagent] install python3 dependent packages for restore_neighbors.py (#6207) Install the necessary python3 dependent packages to convert restore_neighbor.py to support python3 as python2 is EOL. See: Azure/sonic-swss#1542 Signed-off-by: Zhenggen Xu --- dockers/docker-orchagent/Dockerfile.j2 | 6 ++++++ platform/vs/docker-sonic-vs/Dockerfile.j2 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2 index 00728c1c12..4d5c0f0fd5 100755 --- a/dockers/docker-orchagent/Dockerfile.j2 +++ b/dockers/docker-orchagent/Dockerfile.j2 @@ -44,6 +44,12 @@ RUN pip2 install \ netifaces==0.10.7 \ monotonic==1.5 +# Dependencies of restore_neighbors.py +RUN pip3 install \ + scapy==2.4.4 \ + pyroute2==0.5.14 \ + netifaces==0.10.9 + {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %} # Remove installed gcc RUN apt-get remove -y gcc-8 diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index 1baf5d4a18..536eec065c 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -91,6 +91,12 @@ RUN pip2 install crontab RUN pip3 install pyangbind==0.8.1 RUN pip3 uninstall -y enum34 +# Dependencies of restore_neighbors.py +RUN pip3 install \ + scapy==2.4.4 \ + pyroute2==0.5.14 \ + netifaces==0.10.9 + {% if docker_sonic_vs_debs.strip() -%} # Copy locally-built Debian package dependencies {%- for deb in docker_sonic_vs_debs.split(' ') %}