X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=d0e94b1986e6c629fdbdc3452278fe34dab56ff5;hb=053d8ac226aa604c3bdbd0c0a6c5b90bb5d35ee8;hp=7a9999a3c6c911c82b83ba3d6979a7e3064c543a;hpb=2f22ebc9f777f47ff7c7792960e5169b7cab73f3;p=osm%2Fvim-emu.git

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
old mode 100644
new mode 100755
index 7a9999a..d0e94b1
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,13 +1,22 @@
-FROM cgeoffroy/dockernet
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
 
-WORKDIR /son-emu
+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, DCNetwork zerorpc, cAdvisor
+EXPOSE 5000 4242 5151 8090