commit d213eba8b114fa76c764a3cabb773e263a1cc4fc
author beierlm <mark.beierl@canonical.com> Tue Jan 18 08:52:27 2022 -0500
committer beierlm <mark.beierl@canonical.com> Tue Jan 18 16:00:30 2022 +0100
tree 9bb3d6d7d6326a0a3e3395f03b64d966792994da
parent c41fe83a651559f7e85e959beaeff5ea0a1ceaaa

Bug 1863: LTS Support

Updates base to Ubuntu 20.04
Adds apt cache to stage 2 dockerfile
Updates python to 3.8
Updates pip dependencies to more recent versions

Fixes bug 1863

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

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 3fad212..c597522 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,16 +21,23 @@
 #   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 \
         debhelper \
+        dh-python \
         git \
         python3 \
         python3-all \
         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