Merge "Adding an charm generator"

[osm/devops.git] / docker / RO / Dockerfile

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index e6d3763..e5c29d1 100644 (file)
--- 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,16 @@ 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 apt-get update && apt-get install -y python-osm-ro${RO_VERSION} python-osm-im${IM_VERSION}
 
 RUN mkdir -p /bin/RO
 
 COPY scripts/ /bin/RO
 
-VOLUME /opt/openmano/logs
+VOLUME /var/log/osm
 
 EXPOSE 9090
 
@@ -44,4 +49,6 @@ ENV RO_DB_OVIM_PORT=3306
 ENV RO_DB_NAME=mano_db
 ENV RO_DB_OVIM_NAME=mano_vim_db
 
+HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
+  CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
 CMD /bin/RO/start.sh