Update java 8 image in graphadmin

- use 1.13.4 aai-common base image that is back at Java 8

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

diff --git a/.gitignore b/.gitignore
index c491c41..c17eb53 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ debug-logs/
 .classpath
 *.DS_Store
 src/main/resources/etc/scriptdata/addmanualdata/tenant_isolation/payload/
+.vscode
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index be02d62..b15ee5a 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <!-- base image for aai-common -->
         <aai.base.image>alpine</aai.base.image>
         <!-- aai-common image version -->
-        <aai.base.image.version>1.6.0</aai.base.image.version>
+        <aai.base.image.version>1.13.4</aai.base.image.version>
         <!-- End of Docker Related Properties -->
 
         <license.goal.type>check</license.goal.type>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index a9d4f2a..731da9a 100755 (executable)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,4 +1,5 @@
 FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
+USER root
 
 RUN  mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GA /opt/app/aai-graphadmin/logs/gc
 
@@ -8,10 +9,6 @@ VOLUME /opt/tools
 
 HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8449 || 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-graphadmin