commit 5a6d11284fc7a4b1fdc27ffecf2221cbb3f27550
author beierlm <mark.beierl@canonical.com> Wed Jan 26 10:18:21 2022 -0500
committer beierlm <mark.beierl@canonical.com> Sun Jan 30 20:59:00 2022 -0500
tree 48266a37450c356b565b3cbe50e9356c0dd49be7
parent b31d236e360c9b646178c9f3f533bf6b8c61bcbe

Bug 1841: 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
Change stage 3 base image to Ubuntu 20.04 so we can use
python3.8

Fixes bug 1841

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

docker/tests/Dockerfile

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 711b66a..0c1de38 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -15,22 +15,24 @@
 
 ########################################################################
 
-FROM ubuntu:18.04 as INSTALL
+FROM ubuntu:20.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.* \
-    python3=3.6.* \
-    python3-dev=3.6.* \
-    python3-setuptools=39.0.* \
-    curl=7.58.* \
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-dev=3.8.* \
+    python3-pip=20.0.2* \
+    python3-setuptools=45.2.* \
+    curl=7.68.*
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     gettext-base=0.19.* \
-    git=1:2.17.* \
+    git=1:2.25.* \
     iputils-ping=3:* \
-    jq=1.5* \
-    libcurl4-openssl-dev=7.58.* \
-    libssl-dev=1.1.* && \
-    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
+    jq=1.6* \
+    libcurl4-openssl-dev=7.68.* \
+    libssl-dev=1.1.*
 
 ARG OSM_TESTS_URL
 ARG PYTHON3_OSM_IM_URL