From: lombardofr <lombardo@everyup.it>
Date: Tue, 30 Jul 2019 13:37:33 +0000 (+0200)
Subject: fix Bug 811
X-Git-Tag: v7.0.0rc1~76
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=7e29d16a21ef3d5818ec9286227aed1550d58a6b;p=osm%2Fdevops.git

fix Bug 811

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

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 0d317abd..65514e3d 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -1,7 +1,21 @@
+# Copyright 2019 ETSI
+#
+# 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
 
 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
 
@@ -18,8 +32,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 npm install
+RUN mv node_modules ./static
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
 RUN cp /usr/share/osm-lightui/nginx-app.conf /etc/nginx/sites-available/default