X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Flight-ui%2FDockerfile;h=0d317abd076ac38f2f0141be55a76eb7a2750cc7;hb=a1b5bdbd86de48f3bfbf590e6148a311851cde39;hp=29cbb74311d8c6a9840405d8da46dcc6a04db374;hpb=4088a9bdec94c554fe23e35ac9df482c91241de5;p=osm%2Fdevops.git

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 29cbb743..0d317abd 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 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 npm install -g bower
 RUN ln -s /usr/bin/nodejs /usr/bin/node
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 
@@ -18,7 +18,8 @@ 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 bower install --allow-root
+RUN npm install
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
 RUN cp /usr/share/osm-lightui/nginx-app.conf /etc/nginx/sites-available/default
@@ -28,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"]