Bug 1841: LTS Support

[osm/devops.git] / docker / NG-UI / Dockerfile

diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index 8350034..c4d67df 100644 (file)
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #######################################################################################
 
-FROM ubuntu:18.04 AS BUILD
+FROM ubuntu:20.04 as INSTALL
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -25,18 +25,17 @@ RUN if [ ! -z $APT_PROXY ] ; then \
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    apt-transport-https=1.6.* \
-    curl=7.58.* \
+    apt-transport-https=2.0.* \
+    curl=7.68.* \
     gnupg2=2.2.* \
-    nginx=1.14.* \
-    software-properties-common=0.96.* \
+    nginx=1.18.* \
+    software-properties-common=0.99.* \
     xz-utils=5.2.*
 
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-    echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update && \
-    apt-get install -y nodejs=10.24.* \
-    && rm -rf /var/lib/apt/lists/*
+    echo "deb https://deb.nodesource.com/node_10.x focal main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
+    DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs=10.24.*
 
 ARG OSM_NGUI_URL
 
@@ -49,21 +48,28 @@ RUN npm install
 # Building app.
 RUN npm run build
 
-FROM ubuntu:18.04 AS FINAL
+#######################################################################################
+FROM ubuntu:20.04 AS FINAL
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    nginx=1.14.* && \
+    nginx=1.18.* && \
     rm -rf /var/lib/apt/lists/*
 
 # Removing the Nginx default page.
 RUN rm -rf /usr/share/nginx/html/*
 
 # Copying Nginx configuration
-COPY --from=BUILD /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
+COPY --from=INSTALL /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
 
 # Copying angular build to Nginx default page.
-COPY --from=BUILD /usr/share/osm-ngui/dist/osm /usr/share/nginx/html
+COPY --from=INSTALL /usr/share/osm-ngui/dist/osm /usr/share/nginx/html
 
 EXPOSE 80