From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 17 May 2023 10:19:59 +0000 (+0200)
Subject: Update Webhook/Dockerfile to use Ubuntu22 as base image
X-Git-Tag: release-v14.0-start~38
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6bd55c1f6a85eaf3ce614db811cdd7cfb2abc4ac;p=osm%2Fdevops.git

Update Webhook/Dockerfile to use Ubuntu22 as base image

Change-Id: Ic26a3b442bb599b618974571d827a49a0cc73660
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/docker/Webhook/Dockerfile b/docker/Webhook/Dockerfile
index 73e1bd07..d99c877f 100644
--- a/docker/Webhook/Dockerfile
+++ b/docker/Webhook/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 if [ ! -z $APT_PROXY ] ; then \
 
 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_WEBHOOK_TRANSLATOR_URL
 
@@ -41,7 +44,7 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_webhook_translator/requirements.txt
 
 #######################################################################################
-FROM ubuntu:20.04 as FINAL
+FROM ubuntu:22.04 as FINAL
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -51,13 +54,17 @@ RUN if [ ! -z $APT_PROXY ] ; then \
 
 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/local/bin/uvicorn /usr/local/bin/uvicorn
 
 # Creating the user for the app