summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-03-05 09:45:41 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-03-05 09:45:41 +0100
commit6565c3cabc3682d20d0148b2dd8308d6eea516f4 (patch)
tree4f5d4098bb77ab12062252e575654f2fa8a0e432
parente5b5a5e4d7cae28a72641aae6f5f6099db1ed695 (diff)
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>
-rw-r--r--aai-traversal/pom.xml3
-rw-r--r--aai-traversal/src/main/docker/Dockerfile4
2 files changed, 2 insertions, 5 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 4a6f8bf..71e85af 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 b071e89..0186e25 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 \