X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=0dbdd94d4dda33fda5270d2f7b193395d20b7a01;hp=b5a94af3779798d5643ed069a7c298af9dfb8e9c;hb=3509418dfc0daa78b3a5afe3f47fdc07acc18442;hpb=ba7547e41ed94b83e8d7b96d5e4361bde2aca789

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index b5a94af..0dbdd94 100755
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -25,22 +25,24 @@
 # partner consortium (www.sonata-nfv.eu).
 
 FROM ubuntu:trusty
-MAINTAINER steven.vanrossem@intec.ugent.be
 
 ENV SON_EMU_IN_DOCKER 1
 
 RUN apt-get clean
 RUN apt-get update \
-    && apt-get install -y  git aptitude
+    && apt-get install -y  git aptitude build-essential python-setuptools python-dev software-properties-common
 
 
 # install containernet
-RUN apt-get install -y curl python-pip 
+RUN apt-get install -y curl iptables && \
+    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
+RUN pip install -U urllib3==1.21.1
+RUN pip install -U setuptools pyparsing docker python-iptables
 WORKDIR /
 RUN git clone https://github.com/containernet/containernet.git
 RUN containernet/util/install.sh
@@ -49,10 +51,12 @@ 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 / 
-RUN git clone https://github.com/sonata-nfv/son-emu.git
+RUN apt-get install -y  python-dev libffi-dev libssl-dev
+RUN pip install -U 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 / 
@@ -61,5 +65,5 @@ RUN echo 'Done'
 
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
 
-# dummy GK, cAdvisor, Prometheus Push Gateway, son-emu REST API
-EXPOSE 5000 8081 9091 5001
+# dummy GK, cAdvisor, Prometheus Push Gateway, son-emu REST API, OpenStack-fake APIs
+EXPOSE 5000 8081 9091 5001 4000 10243 9005 6001 9775 10697