Merge changes I1d0ee897,Iee1ed292

[osm/devops.git] / docker / light-ui / Dockerfile

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 4440b9a..0d317ab 100644 (file)
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -1,20 +1,27 @@
 FROM ubuntu:16.04
 
-WORKDIR /usr/share/osm-lightui
+RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common libmysqlclient-dev mysql-client
+#RUN npm install -g bower
+RUN ln -s /usr/bin/nodejs /usr/bin/node
+RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 
-RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor
-RUN npm install -g bower
+ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
+ARG RELEASE=ReleaseFOUR-daily
+ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
+ARG REPOSITORY=testing
+ARG LWUI_VERSION
 
-ARG LWUI_VERSION=
-RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/share/osm-lightui && echo LWUI_VERSION
+RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
+RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} LW-UI" && apt-get update
 
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-RUN bower install --allow-root
+RUN apt-get install -y osm-lightui${LWUI_VERSION} && \
+    rm -rf /var/lib/apt/lists/*
 
+WORKDIR /usr/share/osm-lightui
+#RUN bower install --allow-root
+RUN npm install
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
-#
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 RUN cp /usr/share/osm-lightui/nginx-app.conf /etc/nginx/sites-available/default
 RUN cp /usr/share/osm-lightui/supervisor-app.conf /etc/supervisor/conf.d/
 
@@ -22,11 +29,12 @@ RUN cp /usr/share/osm-lightui/supervisor-app.conf /etc/supervisor/conf.d/
 RUN rm -f db.sqlite3
 
 ENV DJANGO_ENV=prod
-RUN python manage.py makemigrations authosm
-RUN python manage.py migrate
 RUN python manage.py collectstatic --noinput
-
+RUN chmod +x /usr/share/osm-lightui/entrypoint.sh
 
 EXPOSE 80
 
-CMD ["supervisord", "-n"]
+HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
+  CMD curl --silent --fail localhost:80 || exit 1
+
+CMD ["/usr/share/osm-lightui/entrypoint.sh"]