commit d7449362766262e09ec63ada999e03ded530f907
author beierlm <mark.beierl@canonical.com> Thu Jan 13 10:53:08 2022 -0500
committer beierlm <mark.beierl@canonical.com> Fri Jan 14 13:29:18 2022 -0500
tree 193172f416325b8bd7d616158e81c07b41eec23e
parent e7646259a1e3047d089fc9b8ca023475288ce533

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

Fixes bug 1841

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

docker/tests/Dockerfile

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 4f7ef7c..ed631cf 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #######################################################################################
 
-FROM ubuntu:18.04 as INSTALL
+FROM ubuntu:20.04 as FINAL
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -25,18 +25,20 @@
 
 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