X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=238ed44c6ba553384068e1677a4deedda7fb07c5;hb=0bb3d47c04f09934885a06f987ff4f520ed5daac;hp=c40af0a1075acaa93cfae1f37c30bdf2c296674f;hpb=c89ba38c6bf5ab503515c02c6ed7045320fd0a74;p=osm%2Fvim-emu.git

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index c40af0a..238ed44 100755
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -24,27 +24,46 @@
 # acknowledge the contributions of their colleagues of the SONATA
 # partner consortium (www.sonata-nfv.eu).
 
-FROM mpeuster/containernet
-MAINTAINER manuel@peuster.de
+FROM ubuntu:trusty
+MAINTAINER steven.vanrossem@intec.ugent.be
 
 ENV SON_EMU_IN_DOCKER 1
 
-WORKDIR /son-emu
-COPY . /son-emu/
-
 RUN apt-get clean
+RUN apt-get update \
+    && apt-get install -y  git aptitude
+
+
+# install containernet
+RUN apt-get install -y curl && \
+    curl https://bootstrap.pypa.io/get-pip.py | python2
+
+# install docker
+RUN curl -fsSL https://get.docker.com/gpg | apt-key add -
+RUN curl -fsSL https://get.docker.com/ | sh
+
+RUN pip install -U urllib3 setuptools pyparsing docker
+WORKDIR /
+RUN git clone https://github.com/containernet/containernet.git
+RUN containernet/util/install.sh
+WORKDIR containernet/
+RUN make develop
+
+# install son-emu
+RUN echo 'install son-emu'
+RUN apt-get install -y  python-dev python-zmq libzmq-dev libffi-dev libssl-dev
+RUN pip install -U zerorpc tabulate argparse networkx six ryu oslo.config pytest Flask flask_restful requests prometheus_client pyaml
+WORKDIR /
+#avoid pulling not the latest git, copy the current dir, to run this from Jenkins
+#RUN git clone https://github.com/sonata-nfv/son-emu.git
+COPY . /son-emu
+WORKDIR son-emu/
+RUN python setup.py develop
+WORKDIR / 
+RUN echo 'Done'
 
-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"]
 
-# dummy GK, zerorpc, DCNetwork zerorpc, cAdvisor
-EXPOSE 5000 4242 5151 8090
+# dummy GK, cAdvisor, Prometheus Push Gateway, son-emu REST API
+EXPOSE 5000 8081 9091 5001