matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-vs][docker-orchagent] install python3 dependent packages for restore_neighbors.py (#6207)

Browse Source 
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 <zxu@linkedin.com>
This commit is contained in:
zhenggen-xu 2020-12-15 11:06:30 -08:00 committed by GitHub
parent 290f66bbb8
commit 182a809dc3
No account linked to committer's email address
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-orchagent/Dockerfile.j2
View File

@ -44,6 +44,12 @@ RUN pip2 install \
netifaces==0.10.7 \ netifaces==0.10.7 \
monotonic==1.5 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" ) %} {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
# Remove installed gcc # Remove installed gcc
RUN apt-get remove -y gcc-8 RUN apt-get remove -y gcc-8

6
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -91,6 +91,12 @@ RUN pip2 install crontab
RUN pip3 install pyangbind==0.8.1 RUN pip3 install pyangbind==0.8.1
RUN pip3 uninstall -y enum34 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() -%} {% if docker_sonic_vs_debs.strip() -%}
# Copy locally-built Debian package dependencies # Copy locally-built Debian package dependencies
{%- for deb in docker_sonic_vs_debs.split(' ') %} {%- for deb in docker_sonic_vs_debs.split(' ') %}