Replace custom base image in schema-service

- use eclipse-temurin:11-jre-alpine base image instead of
  aai-common image
- bump snapshot version to 1.12.10-SNAPSHOT

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

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 44c140c..74e55f9 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.9-SNAPSHOT</version>
+        <version>1.12.10-SNAPSHOT</version>
     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 57f9759..062db8d 100644 (file)
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.9-SNAPSHOT</version>
+        <version>1.12.10-SNAPSHOT</version>
     </parent>
     <artifactId>aai-queries</artifactId>
     <name>aai-queries</name>

diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 81d0e37..bc26767 100644 (file)
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.9-SNAPSHOT</version>
+        <version>1.12.10-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema-gen</artifactId>
     <name>aai-schema-gen</name>

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 00f7778..7bc89dd 100644 (file)
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.9-SNAPSHOT</version>
+        <version>1.12.10-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>
@@ -51,8 +51,6 @@
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
-        <aai.base.image>alpine</aai.base.image>
-        <aai.base.image.version>1.8.1</aai.base.image.version>
 
         <maven.skip.tests>true</maven.skip.tests>
 
@@ -90,32 +88,6 @@
                     <plugin>
                         <groupId>org.codehaus.groovy.maven</groupId>
                         <artifactId>gmaven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>pre-clean</phase>
-                            </execution>
-                            <execution>
-                                <id>parse-base</id>
-                                <phase>pre-clean</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <source>
-                                        def userAaiBaseImage = session.userProperties['aai.base.image'];
-                                        def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
-                                        if (userAaiCommonVersion != null) {
-                                            project.properties['aai.base.image.version'] = userAaiCommonVersion;
-                                        }
-                                        if (userAaiBaseImage != null) {
-                                            project.properties['aai.base.image'] = userAaiBaseImage;
-                                        }
-                                        log.info 'Base image flavour: ' + project.properties['aai.base.image'];
-                                        log.info 'Base image version: ' + project.properties['aai.base.image.version'];
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>

diff --git a/aai-schema-service/src/main/docker/Dockerfile b/aai-schema-service/src/main/docker/Dockerfile
index ab0bd08..89b4681 100644 (file)
--- a/aai-schema-service/src/main/docker/Dockerfile
+++ b/aai-schema-service/src/main/docker/Dockerfile
@@ -1,30 +1,12 @@
-FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
+FROM eclipse-temurin:11-jre-alpine
+USER nobody
 
-# Add the proper files into the docker image from your build
 WORKDIR /opt/app/aai-schema-service
 
 # Expose the ports for outside linux to use
 # 8447 is the important one to be used
 EXPOSE 8447
 
-HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8452 || exit 1
+COPY --chown=nobody:nobody /maven/aai-schema-service/ .
 
-ENTRYPOINT ["/bin/bash", "/opt/app/aai-schema-service/docker-entrypoint.sh"]
-
-VOLUME /tmp
-VOLUME /opt/tools
-
-USER root
-
-COPY --chown=aaiadmin:aaiadmin /maven/aai-schema-service/ /opt/app/aai-schema-service
-
-RUN  mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-SS && \
-     chown -R aaiadmin:aaiadmin /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-SS && \
-     chmod 777 /opt/app/aai-schema-service /opt/app/aai-schema-service/resources/etc/auth
-
-
-ENV AAI_BUILD_VERSION @aai.docker.version@
-
-WORKDIR /opt/app/aai-schema-service
-
-USER aaiadmin
+ENTRYPOINT ["/bin/sh", "/opt/app/aai-schema-service/docker-entrypoint.sh"]

diff --git a/aai-schema-service/src/main/docker/docker-entrypoint.sh b/aai-schema-service/src/main/docker/docker-entrypoint.sh
old mode 100644 (file)
new mode 100755 (executable)
index 74d953e..547572c
--- a/aai-schema-service/src/main/docker/docker-entrypoint.sh
+++ b/aai-schema-service/src/main/docker/docker-entrypoint.sh
@@ -48,16 +48,10 @@ if [ ! -z $scriptName ]; then
     exit 0;
 fi;
 
-mkdir -p /opt/app/aai-schema-service/logs/gc
-mkdir -p /opt/app/aai-schema-service/logs/heap-dumps
-
-if [ -f ${APP_HOME}/resources/aai-schema-service-swm-vars.sh ]; then
-    source ${APP_HOME}/resources/aai-schema-service-swm-vars.sh;
-fi;
-
 JAVA_CMD="exec java";
 
 JVM_OPTS="${PRE_JVM_ARGS}";
+JVM_OPTS="${JVM_OPTS} -XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}";
 JVM_OPTS="${JVM_OPTS} -Dsun.net.inetaddr.ttl=180";
 JVM_OPTS="${JVM_OPTS} ${POST_JVM_ARGS}";
 JAVA_OPTS="${PRE_JAVA_OPTS} -DAJSC_HOME=$APP_HOME";

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 02b6e2d..3a3819d 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.12.9-SNAPSHOT</version>
+        <version>1.12.10-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema</artifactId>
     <name>aai-schema</name>

diff --git a/pom.xml b/pom.xml
index c9083f2..e820d98 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>
-    <version>1.12.9-SNAPSHOT</version>
+    <version>1.12.10-SNAPSHOT</version>
     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>

diff --git a/version.properties b/version.properties
index 293440b..cc408f5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 major_version=1
 minor_version=12
-patch_version=9
+patch_version=10
 
 base_version=${major_version}.${minor_version}.${patch_version}
 # Release must be completed with GIT information # in Jenkins