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 remote-tracking branch 'upstream/master'
[osm/vim-emu.git]
/
utils
/
docker
/
Dockerfile
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
index
7a9999a
..
2c1bda6
100644
(file)
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-1,7
+1,15
@@
FROM cgeoffroy/dockernet
FROM cgeoffroy/dockernet
-WORKDIR /son-emu
+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 \
COPY . /son-emu/
RUN cd /son-emu/ansible \