X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Dockerfile;h=a823cdad172a9a6d141290fdfe90715a912dc664;hp=4b8627a4c06bf66428a6d8fd30d48c8559b253f6;hb=89a3f352578bf43cd4b34d25cfc0e5156c920c45;hpb=4e5c81ecd37e7383c52dad55079f91b90dec22fe

diff --git a/Dockerfile b/Dockerfile
index 4b8627a..a823cda 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,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
@@ -58,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"]