X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=c40af0a1075acaa93cfae1f37c30bdf2c296674f;hb=0d98d75450be28bba00ebabcd9041b4ae541f964;hp=9618c5e221731b5da8d282739b1f8ff4666cbec0;hpb=28bff062115c588192bb98d4a8687da4da845e5a;p=osm%2Fvim-emu.git

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
old mode 100644
new mode 100755
index 9618c5e..c40af0a
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -1,20 +1,50 @@
-FROM cgeoffroy/dockernet
+# Copyright (c) 2015 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
 
-# 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
+FROM mpeuster/containernet
+MAINTAINER manuel@peuster.de
 
-WORKDIR /son-emu
+ENV SON_EMU_IN_DOCKER 1
 
+WORKDIR /son-emu
 COPY . /son-emu/
 
+RUN apt-get clean
+
 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