From: beierlm <mark.beierl@canonical.com>
Date: Tue, 18 Jan 2022 13:48:07 +0000 (-0500)
Subject: Bug 1845: LTS Support
X-Git-Tag: v10.1.0-rc1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=7ccb8c2acb6b8ea0dc19138b2d475e84ec391b85;p=osm%2FNG-UI.git

Bug 1845: LTS Support

Updates base to Ubuntu 20.04
Adds apt cache to stage 2 dockerfile
Fixes bug 1845

Change-Id: I7bb259efc3ac14bb72e9e5fd78562843e4a67e52
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/Dockerfile b/Dockerfile
index f222244..d092886 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,13 @@
 #   devops-stages/stage-build.sh
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+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 update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \