Merge branch 'fog'

[osm/RO.git] / docker / Dockerfile-local

diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index ec9a0ed..1bd50a4 100644 (file)
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -10,6 +10,8 @@ RUN apt-get update && \
     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 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 && \
@@ -21,14 +23,7 @@ RUN apt-get update && \
 
 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 && \