From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 16 Oct 2020 11:25:57 +0000 (+0000)
Subject: Fix bug 1262: docker build updates to use latest npm and ubuntu1804
X-Git-Tag: release-v9.0-start~57
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=0eb6c8b8eb96a05fda9543e53db046ad4d92399f

Fix bug 1262: docker build updates to use latest npm and ubuntu1804

Change-Id: I63a0b1ae854e6bd3173c938b04d6c1793412780f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 204bfd89..b41904be 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -13,10 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
+
+#RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common libssl-dev libmysqlclient-dev mysql-client
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y curl \
+                          software-properties-common \
+                          git \
+                          python-pip \
+                          nginx \
+                          supervisor \
+                          libmariadbclient-dev \
+                          mysql-client \
+                          libssl-dev \
+                          apt-utils \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y npm
 
-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 echo "daemon off;" >> /etc/nginx/nginx.conf
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
@@ -25,13 +37,15 @@ ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 ARG LWUI_VERSION
 
-RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
+RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} LW-UI" && apt-get update
 
-RUN apt-get install -y osm-lightui${LWUI_VERSION} && \
-    rm -rf /var/lib/apt/lists/*
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y osm-lightui${LWUI_VERSION} \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/share/osm-lightui
+RUN npm install -g npm@latest
 RUN npm install
 RUN mv node_modules ./static
 RUN pip install -r requirements.txt