merge master and fix SDN chaining unit test

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

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
old mode 100644 (file)
new mode 100755 (executable)
index 2c1bda6..18e8bfe
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,21 +1,20 @@
-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/
 
 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"]
+
+# dummy GK, zerorpc
+EXPOSE 5000 4242