commit a50fbeb634449657dedcd008ba4a25272ea6441a
author beierlm <mark.beierl@canonical.com> Thu Jan 13 13:19:43 2022 -0500
committer beierlm <mark.beierl@canonical.com> Tue Jan 18 09:00:48 2022 -0500
tree 5fe93812b2ef903c5eb55b42d5d937b051e467fb
parent cb1df501e59675fbf7d68b837f71f879406971c3

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

Change-Id: I203d2d3f9ba636dfc12e0a640bdf445529713402
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