commit 447d457169b3d8b673b147bdf0ab44bf1bbbe45e
author peusterm <manuel.peuster@uni-paderborn.de> Mon Jul 01 11:09:14 2019 +0200
committer peusterm <manuel.peuster@uni-paderborn.de> Mon Jul 01 21:29:54 2019 +0200
tree 449517543ac9357b99090fffac8a5c417aed1804
parent aa4d27cf6ecf9dd7037b1c8292268467efca1805

Fix: pytest 5.0.0 issue that breaks installs

Change-Id: Ice3cddc4083b23e5c9d148c3ddea98c7a982f46f
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index a15ddc9..a823cda 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,12 +44,13 @@
     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 6fcee82e192c8c0e6447650d6f512842185529ee)
+#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