X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=ef6c8fbdbe1742283ad657acd5809da218f98243;hb=3b21649946c32a3525175fa4949b0ac0f488ed31;hp=47b0ed06d6ef5c3f8a3a699ee1ac58eaba8e6e6b;hpb=0dc3ae0d2da2def924685d4bc35a464d2a800af3;p=osm%2Fvim-emu.git

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index 47b0ed0..ef6c8fb 100644
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,24 +1,19 @@
-FROM cgeoffroy/dockernet
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
 
 ENV SON_EMU_IN_DOCKER 1
 
-# ensure that we have the latest dockernet code base!
-WORKDIR /
-RUN rm -rf dockernet
-RUN git clone -b dockernet-sonata https://github.com/mpeuster/dockernet.git
-WORKDIR /dockernet
-RUN python setup.py develop
-
 WORKDIR /son-emu
 COPY . /son-emu/
 
-# ensure that we have the right docker image for tests available
-RUN docker run --rm ubuntu:trusty
-
 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'
 
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
+
+EXPORT
\ No newline at end of file