summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-01-16 17:24:33 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-01-16 17:24:33 +0100
commitd822087391e41355aee18ce65879f37f65c46314 (patch)
tree68295d5d641a0248baaea334a45f2022e319c5be
parent9e02d794ea1b961381af99d3840acd415f27d8f9 (diff)
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>
-rw-r--r--aai-traversal/pom.xml4
-rw-r--r--aai-traversal/src/main/docker/Dockerfile26
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
4 files changed, 22 insertions, 12 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index ef7b2a9..f4b6846 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 c8c346d..2998ec2 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 92e37a4..d43f1d5 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 0c0fa8e..20248c5 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}