X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile-local;h=1dff02d13e847c842d15f625ad89b3e918c273b8;hb=b569e4bf18d0c72093b82e5a84014e19094d0025;hp=ec9a0ede0f59a214132dade51afaf5550f7a3976;hpb=1075715c0ebf180a8bdb7f663a8246488fd3849a;p=osm%2FRO.git

diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index ec9a0ede..1dff02d1 100644
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -1,34 +1,48 @@
-from ubuntu:xenial
+##
+# Copyright {yyyy} {name of copyright owner}
+#
+# 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.
+##
+
+########################################################################
+
+from ubuntu:18.04
 
 LABEL authors="Gennadiy Dubina, Alfonso Tierno, Gerardo Garcia"
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
-    DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens && \
-    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install git python python-pip && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \
     DEBIAN_FRONTEND=noninteractive pip2 install pip==9.0.3 && \
     DEBIAN_FRONTEND=noninteractive pip2 install -U progressbar pyvmomi pyvcloud==19.1.1 && \
+    DEBIAN_FRONTEND=noninteractive pip2 install -U fog05rest && \
+    DEBIAN_FRONTEND=noninteractive pip2 install -U azure && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install python-requests && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-cffi libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-networkx && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install genisoimage && \
     DEBIAN_FRONTEND=noninteractive pip2 install untangle && \
+    DEBIAN_FRONTEND=noninteractive pip2 install pyone && \
     DEBIAN_FRONTEND=noninteractive pip2 install -e git+https://github.com/python-oca/python-oca#egg=oca && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client
 
 COPY . /root/RO
 
-RUN apt-get -y install python-requests && \
-    mkdir -p /root/fos && \
-    cd  /root/fos && \
-    git clone https://github.com/eclipse/fog05 && \
-    cd fog05/src/api/python/rest_api/ && \
-    python setup.py install && \
-    cd ~ && \
-    /root/RO/scripts/install-osm-im.sh --develop && \
+RUN /root/RO/scripts/install-osm-im.sh --develop && \
     /root/RO/scripts/install-lib-osm-openvim.sh --develop && \
     make -C /root/RO prepare && \
     mkdir -p /var/log/osm && \