commit fb76f0432a4ecc44acc5779be9cdcd352cc80734
author beierlm <mark.beierl@canonical.com> Wed Jan 26 10:41:47 2022 -0500
committer beierlm <mark.beierl@canonical.com> Wed Jan 26 10:41:47 2022 -0500
tree 1e1bb721c43a89c87874c59762033e3ef9008115
parent 8b8dc93ee50438893b50d81a39208a50181e0269

Bug 1850: LTS Support

Updates base to Ubuntu 20.04
Updates python to 3.8
Updates pip dependencies to more recent versions
Adds apt cache to stage 2 dockerfile
Pin version of regexp to match IM

Fixes bug 1850

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

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index b949260..6411021 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,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 \