From 62e57d2d834a65dc696407d2c9fd9a710c303fc7 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <fiete.ostkamp@telekom.de>
Date: Mon, 16 Mar 2026 10:53:41 +0100
Subject: [PATCH] Modernise sdc-frontend docker image

- replace custom base image with eclipse-temurin:11-jre-alpine
- aggregate RUN commands to have fewer image layers
- update jetty version (9.4.54.v20240208 -> 9.4.58.v20250814)

Issue-ID: SDC-4803
Change-Id: I4dd6d3d2f9aa673a647280ed8fb4341c25993922
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>
---
 catalog-fe/sdc-frontend/Dockerfile | 38 ++++++++++++++------------------------
 pom.xml                            |  2 +-
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index adf05352f5..6a9d5549f4 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -1,31 +1,27 @@
-FROM onap/integration-java11:10.0.0
+FROM eclipse-temurin:11-jre-alpine
 
 USER root
 ARG JETTY_FOLDER=/app/jetty
 
-RUN apk update && \
+# Create onap user/group, install dependencies, and create Jetty folder
+RUN addgroup -S onap && \
+    adduser -S -G onap -h /home/onap onap && \
     apk add --no-cache curl jq && \
-    rm -rf /var/cache/apk/*
-
-# Create Jetty folder and set permissions
-RUN mkdir -p $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
+    mkdir -p $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
 
 ENV JETTY_HOME=$JETTY_FOLDER
 ENV JETTY_BASE=$JETTY_FOLDER
 ENV JETTY_USER=onap
 ENV JETTY_GROUP=onap
 
-#Download jetty
-
-RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz && \
-        tar xz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
-        rm -rf $JETTY_FOLDER/jetty.tar.gz
-RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
-
-# Download OpenTelemetry Java Agent
-RUN mkdir -p $JETTY_FOLDER/otel && \
+# Download Jetty and OpenTelemetry Java Agent
+RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+    tar xz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
+    rm -rf $JETTY_FOLDER/jetty.tar.gz && \
+    sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml && \
+    mkdir -p $JETTY_FOLDER/otel && \
     wget -q https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${opentelemetry-javaagent.version}/opentelemetry-javaagent.jar \
-    --tries=3 -O $JETTY_FOLDER/otel/opentelemetry-javaagent.jar
+    -O $JETTY_FOLDER/otel/opentelemetry-javaagent.jar
 
 # Add WAR files
 ADD --chown=onap:onap onboarding*.war $JETTY_FOLDER/webapps/
@@ -48,22 +44,16 @@ COPY --chown=onap:onap artifacts/scripts/env_variables.sh $JETTY_FOLDER/
 COPY --chown=onap:onap artifacts/files/org.onap.sdc.p12 $JETTY_FOLDER/etc/
 COPY --chown=onap:onap artifacts/files/org.onap.sdc.trust.jks $JETTY_FOLDER/etc/
 
-# Set permissions
+# Set permissions, run HTTP module setup, and configure Jetty rewrite
 RUN chown -R onap:onap $JETTY_FOLDER && \
     chmod 770 $JETTY_FOLDER/startup.sh $JETTY_FOLDER/set-http-module.sh && \
     chmod 755 $JETTY_FOLDER/setup-keystore-truststore.sh $JETTY_FOLDER/ready-probe.sh && \
     chmod 755 $JETTY_FOLDER/config/catalog-fe/* $JETTY_FOLDER/config/onboarding-fe/* $JETTY_FOLDER/start.d/* && \
     chmod 644 $JETTY_FOLDER/etc/* && chmod 770 /tmp/logback.xml && \
-    # Run HTTP module setup
     $JETTY_FOLDER/set-http-module.sh && \
-    # Clean apk cache to minimize image size
-    rm -rf /var/cache/apk/*
-
-# Add Jetty rewrite and configuration settings
-RUN echo "etc/rewrite-root-to-sdc1.xml" >> "$JETTY_FOLDER/start.d/rewrite.ini" && \
+    echo "etc/rewrite-root-to-sdc1.xml" >> "$JETTY_FOLDER/start.d/rewrite.ini" && \
     echo "jetty.httpConfig.sendServerVersion=false" >> "$JETTY_FOLDER/start.d/start.ini"
 
-
 USER onap
 WORKDIR $JETTY_FOLDER
 
diff --git a/pom.xml b/pom.xml
index 7833c0f8c2..e3cf144472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <ws.rs.version>2.1.6</ws.rs.version>
     <javax.validation.version>2.0.1.Final</javax.validation.version>
 
-    <jetty.version>9.4.54.v20240208</jetty.version>
+    <jetty.version>9.4.58.v20250814</jetty.version>
     <jetty-distribution.version>${jetty.version}</jetty-distribution.version>
     <cxf.version>3.6.3</cxf.version>
 
-- 
2.16.6