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/MON/Dockerfile

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 719d633..0046df8 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -24,13 +24,15 @@
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    curl=7.68.* \
     gcc=4:9.3.* \
     python3=3.8.* \
-    python3-setuptools=45.2.* \
     python3-dev=3.8.* \
-    openssh-client=1:8.* && \
-    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
+    python3-pip=20.0.2* \
+    python3-setuptools=45.2.* \
+    curl=7.68.*
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    openssh-client=1:8.*
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_MON_URL
@@ -50,11 +52,22 @@
     -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
 
+#######################################################################################
 FROM ubuntu:20.04 as FINAL
 
+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 --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     python3-minimal=3.8.* \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     ca-certificates \
     && rm -rf /var/lib/apt/lists/*