From: Seshu Kumar Mudiganti <seshukumar.mudiganti@windriver.com>
Date: Tue, 28 Mar 2023 19:04:27 +0000 (+0000)
Subject: Merge "Fix for GPLv3 issues in base image"
X-Git-Tag: 1.12.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f6cb658aaa384eb9d278cafe569545c514b3965d;hp=ca160e30891d0a7445c013050f70633a12dcf3d1;p=so.git

Merge "Fix for GPLv3 issues in base image"
---

diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
index a1f4fc15ae..1c2af98a60 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 
 ARG http_proxy
 ARG https_proxy
@@ -8,7 +8,7 @@ ENV http_proxy=$HTTP_PROXY
 ENV https_proxy=$HTTPS_PROXY
 
 # Install commonly needed tools
-RUN apk --no-cache add curl netcat-openbsd nss apache2-utils java-cacerts
+RUN apk --no-cache add curl netcat-openbsd openssl apache2-utils java-cacerts
 
 # Create symlink for default Java truststore
 RUN set -eux; \