X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile-local;h=61fb00357292fa3dc25314f213c402a50b072609;hb=ecc683920f5bd9065bae7b07e10953477fd0a3e8;hp=e031cf3dea47f941b905b3985ee0f0e966991008;hpb=0cb7df3190343531e2ccd4b5d404780af678936e;p=osm%2FRO.git

diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index e031cf3d..61fb0035 100644
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -4,23 +4,25 @@ LABEL authors="Gennadiy Dubina, Alfonso Tierno, Gerardo Garcia"
 
 COPY . /root/RO
 
-COPY docker/scripts/ /bin/RO
-
 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 add-apt-repository -y cloud-archive:ocata && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper python3 python3-all python3-pip python3-setuptools && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \
-    DEBIAN_FRONTEND=noninteractive pip install -U pip && \
+    DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \
+    DEBIAN_FRONTEND=noninteractive pip3 install pip==9.0.3 && \
     DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \
     DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \
+    DEBIAN_FRONTEND=noninteractive pip3 install -U pyang pyangbind && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \
-    DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==18.2.2 && \
+    DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \
+    DEBIAN_FRONTEND=noninteractive pip install untangle && \
+    DEBIAN_FRONTEND=noninteractive pip install -e git+https://github.com/python-oca/python-oca#egg=oca && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-bitarray && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client && \
     mkdir -p /root/RO && \
@@ -65,7 +67,8 @@ ENV RO_DB_HOST="" \
     RO_DB_PORT=3306 \
     RO_DB_OVIM_PORT=3306 \
     RO_DB_NAME=mano_db \
-    RO_DB_OVIM_NAME=mano_vim_db
+    RO_DB_OVIM_NAME=mano_vim_db \
+    OPENMANO_TENANT=osm
 
-CMD /bin/RO/start.sh
+CMD RO-start.sh