projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #119 from mpeuster/master
[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
47b0ed0
..
d0e94b1
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-1,24
+1,22
@@
-FROM cgeoffroy/dockernet
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
ENV SON_EMU_IN_DOCKER 1
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/
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 \
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"]
&& python setup.py install \
&& echo 'Done'
ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
+
+# dummy GK, zerorpc, DCNetwork zerorpc, cAdvisor
+EXPOSE 5000 4242 5151 8090