projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed bower from light-ui dockerfile
[osm/devops.git]
/
docker
/
light-ui
/
Dockerfile
diff --git
a/docker/light-ui/Dockerfile
b/docker/light-ui/Dockerfile
index
29cbb74
..
0d317ab
100644
(file)
--- 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
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
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
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
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 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 python manage.py collectstatic --noinput
-
+RUN chmod +x /usr/share/osm-lightui/entrypoint.sh
EXPOSE 80
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"]