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 #99 from stevenvanrossem/master
[osm/vim-emu.git]
/
utils
/
docker
/
Dockerfile
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
index
9618c5e
..
7270ab5
100644
(file)
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-1,19
+1,16
@@
-FROM cgeoffroy/dockernet
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
-# 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
+ENV SON_EMU_IN_DOCKER 1
WORKDIR /son-emu
WORKDIR /son-emu
-
COPY . /son-emu/
RUN cd /son-emu/ansible \
&& ansible-playbook install.yml \
&& cd /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'
&& python setup.py install \
&& echo 'Done'