fix Bug 811

Change-Id: Ic4281dea1164f1eec1f7337a238d61698d16e8b2
Signed-off-by: lombardofr <lombardo@everyup.it>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9723b8e..d3bec05 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,15 +1,27 @@
+# Copyright 2019 EveryUP 
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM ubuntu:16.04
 
 WORKDIR /usr/share/osm-lightui
 COPY . /usr/share/osm-lightui
 
-RUN apt-get update
-RUN apt-get install -y npm git python-pip nginx supervisor libmysqlclient-dev mysql-client
-RUN npm install -g bower
+RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common libmysqlclient-dev mysql-client
 RUN ln -s /usr/bin/nodejs /usr/bin/node
-#RUN bower install --allow-root
 RUN npm install
-RUN mv node_modules /static
+RUN mv node_modules ./static
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
 
@@ -25,4 +37,4 @@ RUN python manage.py collectstatic --noinput
 
 EXPOSE 80
 
-CMD ["/usr/share/osm-lightui/entrypoint.sh"]
+CMD ["/usr/share/osm-lightui/entrypoint.sh"]
\ No newline at end of file