projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First part of Containernet re-integration
[osm/vim-emu.git]
/
utils
/
docker
/
Dockerfile
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
index
47b0ed0
..
ebd3607
100644
(file)
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-1,20
+1,11
@@
-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 \