X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=5f2078eb9e8c50b8e988c6e28be00b68bb5e5a68;hp=64bd790236e5e30fb21c5c3898d8bb69e9246061;hb=bbe128904ab07e43a0386f17a500c679ff9059e0;hpb=e0796231bf6fd5b7d09d4a850227be7bc9bbdc6a

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index 64bd790..5f2078e 100755
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+# Neither the name of the SONATA-NFV, Paderborn University
 # nor the names of its contributors may be used to endorse or promote
 # products derived from this software without specific prior written
 # permission.
@@ -24,32 +24,46 @@
 # acknowledge the contributions of their colleagues of the SONATA
 # partner consortium (www.sonata-nfv.eu).
 
-FROM ubuntu:14.04
-MAINTAINER steven.vanrossem@intec.ugent.be
+FROM ubuntu:trusty
 
 ENV SON_EMU_IN_DOCKER 1
 
+RUN apt-get clean
 RUN apt-get update \
-    && apt-get install -y  ansible 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 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==1.21.1
+RUN pip install -U setuptools pyparsing docker python-iptables
 WORKDIR /
 RUN git clone https://github.com/containernet/containernet.git
-WORKDIR containernet/ansible
-RUN echo 'localhost ansible_connection=local' >> /etc/ansible/hosts
-RUN ansible-playbook install.yml
+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 libffi-dev libssl-dev
+RUN pip install -U 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
-WORKDIR /son-emu/ansible
-RUN ansible-playbook install.yml
-
+#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'
 
 
 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