X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FWebhook%2FDockerfile;h=8373d5c6720c926c0f974e96150cc30e083a132c;hb=21503ab215361ec06b534df59246cacaa242270d;hp=73e1bd07b3ece5a0ae705a72c874826a578d8cc5;hpb=cb9bb7a66ce49050e2ea005276f7d342673bbcc6;p=osm%2Fdevops.git

diff --git a/docker/Webhook/Dockerfile b/docker/Webhook/Dockerfile
index 73e1bd07..8373d5c6 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 preparation
 
 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 preparation
+
 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
@@ -73,6 +80,5 @@ USER appuser
 
 EXPOSE 9998
 
-CMD ["uvicorn", "osm_webhook_translator.main:app", "--host", "0.0.0.0", "--port", "80"]
-
+CMD ["uvicorn", "osm_webhook_translator.main:app", "--host", "0.0.0.0", "--port", "9998"]