X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Dockerfile;h=38adc2a1306a9b9a485216fcbc5e27fec6d51f51;hp=d603a5d368b893b9caf552afd08a2cefaacfe078;hb=655815663bf8234c837793db7a5e2e3c50164d3f;hpb=e7217c366e8c80b7f6ce1e108c00ba66be303c6e

diff --git a/Dockerfile b/Dockerfile
index d603a5d..38adc2a 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,11 +61,15 @@ RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.
 WORKDIR /son-emu
 RUN python setup.py develop
 
-WORKDIR /
+# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
+RUN pip2 install "more-itertools<=5.0.0"
+
+# Hotfix: Do not use latest tinyrpc lib, since it breaks Ryu
+RUN pip2 install "tinyrpc==1.0.3"
 
 # Important: This entrypoint is required to start the OVS service
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
-CMD ["python", "son-emu/examples/default_single_dc_topology.py"]
+CMD ["python", "examples/default_single_dc_topology.py"]
 
 # open ports for emulator APIs
 # SONATA GK