Full integration with new Containernet

[osm/vim-emu.git] / utils / docker / Dockerfile

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index b2ad266..7270ab5 100644 (file)
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,17 +1,16 @@
-FROM cgeoffroy/dockernet
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
 
-# ensure that we have the latest dockernet code base!
-WORKDIR /dockernet
-RUN git pull \
-    && python setup.py develop
+ENV SON_EMU_IN_DOCKER 1
 
 WORKDIR /son-emu
-
 COPY . /son-emu/
 
 RUN cd /son-emu/ansible \
     && ansible-playbook install.yml \
     && cd /son-emu \
+    # we need to reset the __pycache__ for correct test discovery
+    && rm -rf src/emuvim/test/__pycache__ \
     && python setup.py install \
     && echo 'Done'