commit f3c0ac4110f53f542e6330c18a6d753d21d4bead
author beierlm <mark.beierl@canonical.com> Thu Jan 13 11:43:03 2022 -0500
committer beierlm <mark.beierl@canonical.com> Tue Jan 18 09:26:32 2022 -0500
tree 80a03f91d6f4da2682d4cc2894e3c22b7f76cfc6
parent 0fadec09860a942d9b4088afefe39e0413a2e1f9

Bug 1842: 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

Fixes bug 1842

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

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 74b9c36..c597522 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,12 @@
 
 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 \
         debhelper \
@@ -33,5 +39,5 @@
         python3-dev \
         python3-setuptools
 
-RUN python3 -m easy_install pip==21.0.1
-RUN pip3 install tox==3.22.0
+RUN python3 -m easy_install pip==21.3.1
+RUN pip install tox==3.24.5