Fix: Fixed version of tinyrpc to not break the Ryu installation.

[osm/vim-emu.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index b77c268..38adc2a 100755 (executable)
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,12 +44,13 @@ RUN apt-get update \
     curl \
     iptables \
     iputils-ping \
-    sudo
+    sudo \
+    vim
 
 # install containernet (using its Ansible playbook)
-# Attention: Containernet installation fixed to specific commit. Change to update to latest Containernet version.
-RUN git clone https://github.com/containernet/containernet.git && \
-    (cd containernet && git checkout bc269d6f1cf9f50f71fda65c25fe1f2f4c1573b7)
+#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
 
@@ -63,6 +64,9 @@ RUN python setup.py develop
 # 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", "examples/default_single_dc_topology.py"]