X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile-local;h=30ead5a801ccfc2a2bef4ba14e93973048e56364;hb=refs%2Fchanges%2F85%2F6785%2F1;hp=caf104b29f354d957c1b3ac49b4dca2a395121dd;hpb=9784f815e716bb99ee0202c5e3567e958db09152;p=osm%2FRO.git diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index caf104b2..30ead5a8 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -8,11 +8,11 @@ COPY docker/scripts/ /bin/RO RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ - apt-get update && \ DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \ + apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \ 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 pip install -U setuptools setuptools-version-command stdeb && \ DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ @@ -26,7 +26,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-bitarray && \ DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client && \ mkdir -p /root/RO && \ - make -C /root/RO clean all BRANCH=master && \ + make -C /root/RO clean all BRANCH=v4.0 && \ dpkg -i /root/RO/IM/deb_dist/python-pyang_*.deb && \ dpkg -i /root/RO/IM/deb_dist/python-pyangbind_*.deb && \ dpkg -i /root/RO/IM/deb_dist/python-osm-im*.deb && \ @@ -55,6 +55,7 @@ EXPOSE 9090 # RO_DB_OVIM_PORT: default value '3306' # RO_DB_NAME: default value 'mano_db' # RO_DB_OVIM_NAME: default value 'mano_vim_db' +# RO_LOG_FILE: default log to stderr if not defined ENV RO_DB_HOST="" \ RO_DB_OVIM_HOST="" \ @@ -67,7 +68,9 @@ 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 \ + RO_LOG_LEVEL=DEBUG CMD /bin/RO/start.sh