summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-02-21 14:26:56 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-02-21 14:26:56 +0100
commit41dafac1b153d3db7f99c94dfee1b87ec10330f5 (patch)
tree42ac236a9421578f278ffc53a7911320f3395351
parentea823c3681d27c46b7e560d4f9f89cb3fca661a6 (diff)
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>
-rw-r--r--.gitignore1
-rwxr-xr-xpom.xml2
-rwxr-xr-xsrc/main/docker/Dockerfile5
3 files changed, 3 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index c491c41..c17eb53 100644
--- 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
--- 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
--- 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