Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[docker-ptf]: Install python modules from pypi #788

Merged
merged 14 commits into from
Jul 6, 2017
Merged

[docker-ptf]: Install python modules from pypi #788

Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4ea6318
Fix SAI submodule id
pavel-shirshov May 30, 2017
991124c
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 30, 2017
219c4d0
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 31, 2017
1db3b3d
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 1, 2017
ebb58b6
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 10, 2017
f1a9ca2
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 12, 2017
cd5f07f
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 27, 2017
045ae9d
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 29, 2017
19adf1e
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jul 1, 2017
832e2d4
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 5, 2017
4cf1e74
Install python modules from pypi not from debian repo
pavel-shirshov Jul 5, 2017
07ee0f7
Remove get-pip and don't install parallel-ssh
pavel-shirshov Jul 5, 2017
4f5795d
Use latest cffi
pavel-shirshov Jul 6, 2017
cf8e803
Update comments
pavel-shirshov Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions dockers/docker-ptf/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,29 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
&& apt-get install -y \
openssh-server \
vim \
python \
python-scapy \
net-tools \
python-setuptools \
supervisor \
traceroute \
lsof \
tcpdump \
unzip \
pkg-config \
binutils \
net-tools \
python-pip \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
wget \
cmake \
libqt5core5a \
libqt5network5 \
less \
ipython \
git \
iputils-ping \
hping3 \
curl

## Reinstall scapy by version from p4lang
RUN git clone https://github.com/p4lang/scapy-vxlan.git && cd scapy-vxlan && python setup.py install
curl \
python \
python-dev \
python-scapy

RUN dpkg -i \
{% for deb in docker_ptf_debs.split(' ') -%}
Expand All @@ -60,6 +53,17 @@ RUN rm -rf /debs \
&& apt-get -y autoclean \
&& apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/* \
&& wget --https-only https://bootstrap.pypa.io/get-pip.py \
&& python get-pip.py \
&& rm -f get-pip.py \
&& pip install setuptools \
&& pip install supervisor \
&& pip install ipython==5.4.1 \
&& git clone https://github.com/p4lang/scapy-vxlan.git \
&& cd scapy-vxlan \
&& python setup.py install \
&& cd .. \
&& rm -fr scapy-vxlan \
&& wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& tar xvfz 1.0.0.tar.gz \
&& cd nanomsg-1.0.0 \
Expand All @@ -78,7 +82,6 @@ RUN rm -rf /debs \
&& pip install ipaddress \
&& pip install pysubnettree \
&& pip install paramiko \
&& pip install parallel-ssh \
&& pip install flask \
&& pip install exabgp==3.4.17\
&& mkdir -p /opt \
Expand Down