Merge "Change openjdk baseOS imgs to integration-*"

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 3f0bd54..b3fdd3c 100755 (executable)
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -4,6 +4,7 @@
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
   * Modifications Copyright (C) 2018 Nokia. All rights reserved.
+  * Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.

diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile
index 35e7bd0..7bc92c8 100644 (file)
--- a/datarouter-node/src/main/resources/docker/Dockerfile
+++ b/datarouter-node/src/main/resources/docker/Dockerfile
@@ -4,6 +4,7 @@
 #  ===========================================================================
 #  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 #  Modifications Copyright (C) 2018 Nokia. All rights reserved.
+#  Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved.
 #  ===========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,15 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 COPY /opt /opt
 
 ARG user=onap
 ARG group=onap
 
-RUN apk update && apk add curl && apk add vim
+USER root
+RUN apk add --no-cache curl
 
 EXPOSE 8080 8443
 
@@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh
 
 ENTRYPOINT ["sh", "startup.sh"]
 
-RUN addgroup -S $group && adduser -G $group -D $user \
-    && chown -R $user:$group /opt/ /var/log
+# onap user and group already avaliable in base img
+RUN chown -R $user:$group /opt/ /var/log
 
-USER $user
\ No newline at end of file
+USER $user

diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile
index 35e7bd0..7bc92c8 100644 (file)
--- a/datarouter-prov/src/main/resources/docker/Dockerfile
+++ b/datarouter-prov/src/main/resources/docker/Dockerfile
@@ -4,6 +4,7 @@
 #  ===========================================================================
 #  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 #  Modifications Copyright (C) 2018 Nokia. All rights reserved.
+#  Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved.
 #  ===========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,15 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 COPY /opt /opt
 
 ARG user=onap
 ARG group=onap
 
-RUN apk update && apk add curl && apk add vim
+USER root
+RUN apk add --no-cache curl
 
 EXPOSE 8080 8443
 
@@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh
 
 ENTRYPOINT ["sh", "startup.sh"]
 
-RUN addgroup -S $group && adduser -G $group -D $user \
-    && chown -R $user:$group /opt/ /var/log
+# onap user and group already avaliable in base img
+RUN chown -R $user:$group /opt/ /var/log
 
-USER $user
\ No newline at end of file
+USER $user

diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile
index 35e7bd0..7bc92c8 100644 (file)
--- a/datarouter-subscriber/src/main/resources/docker/Dockerfile
+++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile
@@ -4,6 +4,7 @@
 #  ===========================================================================
 #  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 #  Modifications Copyright (C) 2018 Nokia. All rights reserved.
+#  Modifications Copyright (C) 2021 Samsung Electronics. All rights reserved.
 #  ===========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,15 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 COPY /opt /opt
 
 ARG user=onap
 ARG group=onap
 
-RUN apk update && apk add curl && apk add vim
+USER root
+RUN apk add --no-cache curl
 
 EXPOSE 8080 8443
 
@@ -34,7 +36,7 @@ RUN chmod 0700 startup.sh
 
 ENTRYPOINT ["sh", "startup.sh"]
 
-RUN addgroup -S $group && adduser -G $group -D $user \
-    && chown -R $user:$group /opt/ /var/log
+# onap user and group already avaliable in base img
+RUN chown -R $user:$group /opt/ /var/log
 
-USER $user
\ No newline at end of file
+USER $user

diff --git a/pom.xml b/pom.xml
index cb4d099..041891b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     </parent>
     <properties>
         <!--revision must also be set in the version.properties file at project root-->
-        <revision>2.1.7-SNAPSHOT</revision>
+        <revision>2.1.8-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>

diff --git a/version.properties b/version.properties
index 1ac7a41..cdff0bd 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 \r
 major=2\r
 minor=1\r
-patch=7\r
+patch=8\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r