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.

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

[docker-sonic-mgmt] Merge spytest dependencies into mgmt docker #4411

Merged
merged 1 commit into from
Apr 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 0 additions & 29 deletions dockers/docker-sonic-mgmt-spytest/Dockerfile.j2

This file was deleted.

25 changes: 23 additions & 2 deletions dockers/docker-sonic-mgmt/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ RUN apt-get install -y \
cmake \
tcpdump \
snmp \
python-dev \
python-scapy
python-scapy \
lguohan marked this conversation as resolved.
Show resolved Hide resolved
inetutils-ping \
telnet

# For JNLP launcher
RUN apt-get install -y default-jre
Expand Down Expand Up @@ -54,6 +55,25 @@ RUN pip install ipaddr \
passlib \
ipython==5.4.1 \
virtualenv \
"cryptography>=2.5" \
"future>=0.16.0" \
gitpython \
jsonpatch \
netmiko==2.4.2 \
prettytable \
psutil \
pycryptodome \
pyfiglet \
pylint==1.8.1 \
pyro4 \
pytest-repeat \
pytest-xdist==1.28.0 \
pytest==4.6.5 \
redis \
requests \
rpyc \
tabulate \
textfsm \
&& git clone https://github.com/p4lang/scapy-vxlan.git \
&& cd scapy-vxlan \
&& python setup.py install \
Expand Down Expand Up @@ -121,6 +141,7 @@ ARG hostname

ENV BUILD_HOSTNAME $hostname
ENV USER $user
ENV CC=gcc CPP=cpp CXX=c++ LDSHARED="gcc -pthread -shared" PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1

RUN groupadd -f -r -g $guid g$user

Expand Down
6 changes: 0 additions & 6 deletions rules/docker-sonic-mgmt-spytest.mk

This file was deleted.