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>
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 48fcede..a0a0935 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/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,18 +25,21 @@
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
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- apt-transport-https=2.0.* \
+ apt-transport-https=2.4.* \
gnupg2=2.2.* \
- openssh-client=1:8.*
+ openssh-client=1:8.* \
+ && rm -rf /var/lib/apt/lists/*
# https://kubernetes.io/releases/
RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
@@ -73,7 +76,7 @@
-r /usr/lib/python3/dist-packages/n2vc/requirements.txt
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -83,9 +86,15 @@
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 DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
ca-certificates \
@@ -93,9 +102,6 @@
RUN rm -f /etc/apt/apt.conf.d/proxy.conf
-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/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index cd56f53..11b6e14 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/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
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -55,7 +58,8 @@
-r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+#######################################################################################
+FROM ubuntu:22.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -65,9 +69,15 @@
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 DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
ca-certificates \
@@ -75,8 +85,6 @@
RUN rm -f /etc/apt/apt.conf.d/proxy.conf
-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 /usr/bin/scp /usr/bin/scp
COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 8957479..51f273f 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/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_IM_URL
@@ -51,7 +54,7 @@
-r /usr/lib/python3/dist-packages/osm_nbi/requirements.txt
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -61,13 +64,16 @@
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/*
-RUN rm -f /etc/apt/apt.conf.d/proxy.conf
-
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/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
# Creating the user for the app
RUN groupadd -g 1000 appuser && \
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
diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 22653e3..8ed8f5e 100644
--- a/docker/POL/Dockerfile
+++ b/docker/POL/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
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -50,7 +53,7 @@
-r /usr/lib/python3/dist-packages/osm_policy_module/requirements.txt
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -60,13 +63,15 @@
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/*
-RUN rm -f /etc/apt/apt.conf.d/proxy.conf
-
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/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+
+#######################################################################################
+# End of common prepration
+
COPY --from=INSTALL /usr/bin/osm* /usr/bin/
COPY --from=INSTALL /usr/bin/mysql /usr/bin/
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 64bad45..57c5f6a 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/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
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -85,7 +88,8 @@
-r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+#######################################################################################
+FROM ubuntu:22.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@ -95,13 +99,17 @@
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
-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/genisoimage /usr/bin/genisoimage
COPY --from=INSTALL /etc/protocols /etc/protocols
diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 5eeda0d..e4f7ae4 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
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
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \