X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=27157d8412a3df6b17a5e5e3dc2a31e23ba02130;hb=dbec60ad4b76880e0471d90d81136af06052148b;hp=70ad852d0a825f3cb9120106f1054ec256708c36;hpb=cd4a312b089fea5cb39706c08f02ff2e01d76757;p=osm%2Fvim-emu.git

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
old mode 100644
new mode 100755
index 70ad852..27157d8
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,18 +1,22 @@
-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 install
+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__ \
+    && rm -rf src/emuvim/test/unittests/__pycache__ \
+    && rm -rf src/emuvim/test/integrationtests/__pycache__ \
     && python setup.py install \
     && echo 'Done'
 
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
+
+# dummy GK, zerorpc
+EXPOSE 5000 4242