X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=4240d26de1675eb6ce97c06f0b059552413e3456;hb=b6e0266a557b25d6b791661919f537e5bb32c2a5;hp=e6d3763280dfd821294268d12bab05303311c330;hpb=182bd73468eb7e3a69254bed25f12a91b18393d0;p=osm%2Fdevops.git

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index e6d37632..4240d26d 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -2,7 +2,10 @@ from ubuntu:xenial
 
 MAINTAINER Gennadiy Dubina <gennadiy.dubina@dataat.com>; Alfonso Tierno <alfonso.tiernosepulveda@telefoncia.com>
 
-RUN apt-get update && apt-get -y install curl software-properties-common
+RUN apt-get update && apt-get -y install curl software-properties-common git
+RUN DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens
+RUN apt-get update && apt-get install -y python-setuptools python-wheel mysql-client python-bitarray python-pip
+RUN DEBIAN_FRONTEND=noninteractive pip2 install pip==9.0.3 pyangbind
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseFOUR-daily
@@ -12,14 +15,13 @@ ARG REPOSITORY=testing
 RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
 RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} RO IM common openvim" && apt update
 
-RUN apt-get update && apt-get install -y python-setuptools python-wheel mysql-client python-bitarray
-RUN apt-get update && apt-get install -y python-osm-ro python-osm-im
+ARG RO_VERSION
+ARG IM_VERSION
 
-RUN mkdir -p /bin/RO
+RUN apt-get update && apt-get install -y python-osm-ro${RO_VERSION} python-osm-im${IM_VERSION}
 
-COPY scripts/ /bin/RO
 
-VOLUME /opt/openmano/logs
+VOLUME /var/log/osm
 
 EXPOSE 9090
 
@@ -44,4 +46,7 @@ ENV RO_DB_OVIM_PORT=3306
 ENV RO_DB_NAME=mano_db
 ENV RO_DB_OVIM_NAME=mano_vim_db
 
-CMD /bin/RO/start.sh
+HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
+  CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
+CMD /usr/bin/RO-start.sh
+