From d822087391e41355aee18ce65879f37f65c46314 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Tue, 16 Jan 2024 17:24:33 +0100
Subject: [PATCH] Update aai-common base image in aai-traversal

- update aai-common base image from 1.6.0 to 1.13.1

Issue-ID: AAI-3732
Change-Id: I6f96d34a30031423d1b2e35a95ccab9ace6b657a
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-traversal/pom.xml                    |  4 ++--
 aai-traversal/src/main/docker/Dockerfile | 26 ++++++++++++++++++--------
 pom.xml                                  |  2 +-
 version.properties                       |  2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index ef7b2a96..f4b68462 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.aai.traversal</groupId>
 		<artifactId>traversal</artifactId>
-		<version>1.13.1-SNAPSHOT</version>
+		<version>1.13.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.onap.aai.traversal</groupId>
 	<artifactId>aai-traversal</artifactId>
@@ -60,7 +60,7 @@
 		<aai.docker.version>1.0.0</aai.docker.version>
 		<aai.docker.namespace>onap</aai.docker.namespace>
 		<aai.base.image>alpine</aai.base.image>
-		<aai.base.image.version>1.6.0</aai.base.image.version>
+		<aai.base.image.version>1.13.1</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 c8c346de..2998ec21 100644
--- a/aai-traversal/src/main/docker/Dockerfile
+++ b/aai-traversal/src/main/docker/Dockerfile
@@ -1,21 +1,31 @@
 FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
-RUN  mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ
-
+USER root
+# RUN addgroup aaiadmin -g 1000
+# RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+# 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 \
+#   && chown -R aaiadmin:aaiadmin /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \
+#   && chown -R aaiadmin:aaiadmin /opt/app/aai-traversal /etc/profile.d /opt/app /opt/aai/logroot
+RUN mkdir -p \
+    /opt/aaihome/aaiadmin \
+    /opt/aai/logroot/AAI-GQ \
+    /opt/app/aai-traversal \
+    /opt/aai/logroot \
+  && chown -R aaiadmin:aaiadmin \
+    /opt/app/aai-traversal \
+    /etc/profile.d \
+    /opt/app \
+    /opt/aai/logroot
 VOLUME /tmp
 VOLUME /opt/tools
 
 HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8446 || exit 1
 
-RUN groupadd aaiadmin -g 1000
-
-RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
-
 # Add the proper files into the docker image from your build
 WORKDIR /opt/app/aai-traversal
 
-RUN chown -R aaiadmin:aaiadmin /opt/app/aai-traversal /etc/profile.d /opt/aai/logroot/AAI-GQ /opt/app /opt/aai/logroot
-
 COPY --chown=aaiadmin:aaiadmin /maven/aai-traversal/ .
 
 USER aaiadmin
diff --git a/pom.xml b/pom.xml
index 92e37a48..d43f1d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.13.1-SNAPSHOT</version>
+    <version>1.13.2-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
diff --git a/version.properties b/version.properties
index 0c0fa8e9..20248c5f 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=13
-patch_version=1
+patch_version=2
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
-- 
2.16.6