X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Dockerfile;h=a823cdad172a9a6d141290fdfe90715a912dc664;hp=856d796fb6bd83f833a591da4adfece295a0e4c9;hb=refs%2Fchanges%2F76%2F7976%2F1;hpb=9db5720aee118d414d1a4f84780b16f28bc557f7

diff --git a/Dockerfile b/Dockerfile
index 856d796..a823cda 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,7 @@
 FROM ubuntu:xenial
 
 ENV SON_EMU_IN_DOCKER 1
+ENV PIP_DEFAULT_TIMEOUT=100
 
 # install required packages
 RUN apt-get clean
@@ -43,9 +44,12 @@ RUN apt-get update \
     curl \
     iptables \
     iputils-ping \
-    sudo
+    sudo \
+    vim
 
 # install containernet (using its Ansible playbook)
+#RUN git clone https://github.com/containernet/containernet.git && \
+#    (cd containernet && git checkout 6fcee82e192c8c0e6447650d6f512842185529ee)
 RUN git clone https://github.com/containernet/containernet.git
 WORKDIR /containernet/ansible
 RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
@@ -57,6 +61,9 @@ RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.
 WORKDIR /son-emu
 RUN python setup.py develop
 
+# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
+RUN pip2 install "more-itertools<=5.0.0"
+
 # Important: This entrypoint is required to start the OVS service
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
 CMD ["python", "examples/default_single_dc_topology.py"]