From: beierlm <mark.beierl@canonical.com>
Date: Tue, 1 Jun 2021 20:20:42 +0000 (-0400)
Subject: NG-UI Update nginx for CVE
X-Git-Tag: v10.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d615331715f392026fe6439f94c488a8e39c9cbb;p=osm%2Fdevops.git

NG-UI Update nginx for CVE

Security patch 1.14.0-0ubuntu1.9 has been issued

Fixes BUG-1555

Change-Id: I61811a6a1494138b4715dfcbf4c7959e10916ba4
Signed-off-by: beierlm <mark.beierl@canonical.com>
(cherry picked from commit f6ec22e2e4bc832511a4b7da112826e032e187c8)
---

diff --git a/Dockerfile b/Dockerfile
index 5717b7ac..a3f74004 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,9 +25,6 @@
 #
 
 FROM ubuntu:18.04
-ENV LANG en_IN.UTF-8
-ENV LC_ALL en_IN.UTF-8
-ENV LANGUAGE en_IN.UTF-8
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \
@@ -41,3 +38,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
 
 RUN python3 -m easy_install pip==21.0.1
 RUN pip3 install tox==3.22.0
+
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
+
diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index 24ffe1ca..934566d6 100644
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -20,7 +20,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     apt-transport-https=1.6.12ubuntu0.2 \
     curl=7.58.0-2ubuntu3.13 \
     gnupg2=2.2.4-1ubuntu1.4 \
-    nginx=1.14.0-0ubuntu1.7 \
+    nginx=1.14.0-0ubuntu1.9 \
     software-properties-common=0.96.24.32.14 \
     xz-utils=5.2.2-1.3
 
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 0eb184c7..1d9cfc3a 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -531,17 +531,6 @@ function docker_login() {
 }
 
 function generate_docker_images() {
-    cat << EOF
-========================================================================================
-
-
-
-
-
-========================================================================================
-EOF
-    set -x
-    sleep 5
     echo "Pulling and generating docker images"
     [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login