From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Tue, 5 Mar 2024 08:45:41 +0000 (+0100)
Subject: Update aai-common base image in resources to 1.13.4 (newer java 8)
X-Git-Tag: 1.13.4~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6565c3cabc3682d20d0148b2dd8308d6eea516f4;p=aai%2Ftraversal.git

Update aai-common base image in resources to 1.13.4 (newer java 8)

Issue-ID: AAI-3794
Change-Id: I6f9b7dbb28c0fab86c86e93fe6a10e965d990ab7
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 4a6f8bf7..71e85af4 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -59,8 +59,7 @@
 		<aai.docker.version>1.0.0</aai.docker.version>
 		<aai.docker.namespace>onap</aai.docker.namespace>
 		<aai.base.image>alpine</aai.base.image>
-		<!-- image versions > 1.6.0 are based on Java 11 -->
-		<aai.base.image.version>1.6.0</aai.base.image.version>
+		<aai.base.image.version>1.13.4</aai.base.image.version>
 
 		<!-- Nexus Proxy Properties and Snapshot Locations Ideally this can be 
 			overwritten at runtime per internal environment specific values at runtime -->
diff --git a/aai-traversal/src/main/docker/Dockerfile b/aai-traversal/src/main/docker/Dockerfile
index b071e892..0186e254 100644
--- a/aai-traversal/src/main/docker/Dockerfile
+++ b/aai-traversal/src/main/docker/Dockerfile
@@ -2,9 +2,7 @@ FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 USER root
 
-RUN groupadd aaiadmin -g 1000 \
-  && adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin \
-  && mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \
+RUN mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \
       /opt/app/aai-traversal \
   && chown -R aaiadmin:aaiadmin /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \
       /opt/app/aai-traversal /etc/profile.d /opt/app /opt/aai/logroot \