Skip to content

Commit

Permalink
[docker-vs][docker-orchagent] install python3 dependent packages for …
Browse files Browse the repository at this point in the history
…restore_neighbors.py (#6207)

Install the necessary python3 dependent packages to convert restore_neighbor.py 
to support python3 as python2 is EOL. See: sonic-net/sonic-swss#1542

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
  • Loading branch information
zhenggen-xu authored Dec 15, 2020
1 parent 290f66b commit 182a809
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions dockers/docker-orchagent/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions platform/vs/docker-sonic-vs/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ') %}
Expand Down

0 comments on commit 182a809

Please sign in to comment.