commit 02feb8ef9ae5f545a111759cbbe9f01b1741cc85
author Mark Beierl <mark.beierl@canonical.com> Wed May 10 11:44:11 2023 -0400
committer beierlm <mark.beierl@canonical.com> Wed May 10 21:47:27 2023 +0200
tree 2473db830191f386af09c439836538763c021da4
parent 54f21dc2e06cc72582026cf28b2206042f87133d

Updates to Python 3.10 and Ubuntu22.04

Updates all dockerfiles for stage 3 to use newer versions

Change-Id: I4d73e04e11be4e12c98467f5d24ee5daff699d89
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

docker/PLA/Dockerfile

diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile
index f637362..9c23262 100644
--- a/docker/PLA/Dockerfile
+++ b/docker/PLA/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #######################################################################################
 
-FROM ubuntu:20.04 as INSTALL
+FROM ubuntu:22.04 as INSTALL
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -25,12 +25,15 @@
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:9.3.* \
-    python3=3.8.* \
-    python3-dev=3.8.* \
-    python3-pip=20.0.2* \
-    python3-setuptools=45.2.* \
-    curl=7.68.*
+    gcc=4:11.* \
+    python3=3.10.* \
+    python3-dev=3.10.* \
+    python3-pip=22.0.* \
+    curl=7.81.* \
+    && rm -rf /var/lib/apt/lists/*
+
+#######################################################################################
+# End of common prepration
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_PLA_URL
@@ -51,7 +54,7 @@
     mv /MiniZincIDE-2.4.2-bundle-linux /minizinc
 
 #######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -61,15 +64,19 @@
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    python3-minimal=3.8.* \
+    python3-minimal=3.10.* \
     && rm -rf /var/lib/apt/lists/*
 
+COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
+COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages  /usr/local/lib/python3.10/dist-packages
+
+#######################################################################################
+# End of common prepration
+
 RUN rm -f /etc/apt/apt.conf.d/proxy.conf
 
 LABEL authors="Lars-Göran Magnusson"
 
-COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
-COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages
 COPY --from=INSTALL /usr/bin/osm* /usr/bin/
 COPY --from=INSTALL /minizinc /minizinc