Change openjdk baseOS img to integration-java11

Benefits from switching over:
* minimal {java11,python} images maintained by integration team
* using currently "blessed by seccom" versions (:latest tag used)
* should limit spread of legal issues across layers
* integration images will be the first to have automated compliance
  documentation
* should limit spread of base layers (contributing to deployment
  footprint - more base layers = more to download, more to store etc...)

Issue-ID: INT-1864
Issue-ID: DCAEGEN2-2420
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: Ibd6f379b869306c5f14f06f6efe60c5a3c32f779

diff --git a/build/hv-collector-analysis/pom.xml b/build/hv-collector-analysis/pom.xml
index 9f25f9d..4adce84 100644 (file)
--- a/build/hv-collector-analysis/pom.xml
+++ b/build/hv-collector-analysis/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-build</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/build/hv-collector-coverage/pom.xml b/build/hv-collector-coverage/pom.xml
index 78196d6..3adbafe 100644 (file)
--- a/build/hv-collector-coverage/pom.xml
+++ b/build/hv-collector-coverage/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-build</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
index e51dbb0..a8bf358 100644 (file)
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>ves-hv-collector</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index cc172af..2050827 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
     <artifactId>ves-hv-collector</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>dcaegen2-collectors-veshv</name>
     <description>VES HighVolume Collector</description>
     <packaging>pom</packaging>

diff --git a/sources/hv-collector-commandline/pom.xml b/sources/hv-collector-commandline/pom.xml
index 5346cbf..4999f6e 100644 (file)
--- a/sources/hv-collector-commandline/pom.xml
+++ b/sources/hv-collector-commandline/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>hv-collector-sources</artifactId>
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hv-collector-commandline</artifactId>

diff --git a/sources/hv-collector-configuration/pom.xml b/sources/hv-collector-configuration/pom.xml
index 542ed4f..5bf9163 100644 (file)
--- a/sources/hv-collector-configuration/pom.xml
+++ b/sources/hv-collector-configuration/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-configuration</artifactId>

diff --git a/sources/hv-collector-core/pom.xml b/sources/hv-collector-core/pom.xml
index 95820d0..6aa844f 100644 (file)
--- a/sources/hv-collector-core/pom.xml
+++ b/sources/hv-collector-core/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ct/pom.xml b/sources/hv-collector-ct/pom.xml
index 953f84c..a50f07e 100644 (file)
--- a/sources/hv-collector-ct/pom.xml
+++ b/sources/hv-collector-ct/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-dcae-app-simulator/Dockerfile b/sources/hv-collector-dcae-app-simulator/Dockerfile
index a561fff..ae22908 100644 (file)
--- a/sources/hv-collector-dcae-app-simulator/Dockerfile
+++ b/sources/hv-collector-dcae-app-simulator/Dockerfile
@@ -1,13 +1,12 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-LABEL copyright="Copyright (C) 2018 NOKIA"
-LABEL license.name="The Apache Software License, Version 2.0"
-LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
-LABEL maintainer="Nokia Wroclaw ONAP Team"
+LABEL copyright="Copyright (C) 2018 NOKIA" \
+      license.name="The Apache Software License, Version 2.0" \
+      license.url="http://www.apache.org/licenses/LICENSE-2.0" \
+      maintainer="Nokia Wroclaw ONAP Team"
 
-RUN apt-get update \
-        && apt-get install -y --no-install-recommends curl  \
-        && apt-get clean
+USER root
+RUN apk add --no-cache curl
 
 WORKDIR /opt/ves-hv-dcae-app-simulator
 

diff --git a/sources/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml
index 797a70a..f392651 100644 (file)
--- a/sources/hv-collector-dcae-app-simulator/pom.xml
+++ b/sources/hv-collector-dcae-app-simulator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml
index 1ff2131..4002e23 100644 (file)
--- a/sources/hv-collector-domain/pom.xml
+++ b/sources/hv-collector-domain/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-domain</artifactId>

diff --git a/sources/hv-collector-health-check/pom.xml b/sources/hv-collector-health-check/pom.xml
index ed1bd2a..92173b0 100644 (file)
--- a/sources/hv-collector-health-check/pom.xml
+++ b/sources/hv-collector-health-check/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-health-check</artifactId>

diff --git a/sources/hv-collector-kafka-consumer/Dockerfile b/sources/hv-collector-kafka-consumer/Dockerfile
index aed9680..6ec0ba7 100644 (file)
--- a/sources/hv-collector-kafka-consumer/Dockerfile
+++ b/sources/hv-collector-kafka-consumer/Dockerfile
@@ -1,13 +1,12 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-LABEL copyright="Copyright (C) 2019 NOKIA"
-LABEL license.name="The Apache Software License, Version 2.0"
-LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
-LABEL maintainer="Nokia Wroclaw ONAP Team"
+LABEL copyright="Copyright (C) 2019 NOKIA" \
+      license.name="The Apache Software License, Version 2.0" \
+      license.url="http://www.apache.org/licenses/LICENSE-2.0" \
+      maintainer="Nokia Wroclaw ONAP Team"
 
-RUN apt-get update \
-        && apt-get install -y --no-install-recommends curl  \
-        && apt-get clean
+USER root
+RUN apk add --no-cache curl
 
 WORKDIR /opt/hv-ves-kafka-consumer
 

diff --git a/sources/hv-collector-kafka-consumer/pom.xml b/sources/hv-collector-kafka-consumer/pom.xml
index 8537e0e..1e12e0d 100644 (file)
--- a/sources/hv-collector-kafka-consumer/pom.xml
+++ b/sources/hv-collector-kafka-consumer/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
     <artifactId>hv-collector-sources</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/sources/hv-collector-kafka/pom.xml b/sources/hv-collector-kafka/pom.xml
index cfeeb33..08234eb 100644 (file)
--- a/sources/hv-collector-kafka/pom.xml
+++ b/sources/hv-collector-kafka/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile
index 178045c..5f2dda7 100644 (file)
--- a/sources/hv-collector-main/Dockerfile
+++ b/sources/hv-collector-main/Dockerfile
@@ -1,31 +1,33 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-LABEL copyright="Copyright (C) 2018-2019 NOKIA"
-LABEL license.name="The Apache Software License, Version 2.0"
-LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
-LABEL maintainer="Nokia Wroclaw ONAP Team"
+LABEL copyright="Copyright (C) 2018-2019 NOKIA" \
+      license.name="The Apache Software License, Version 2.0" \
+      license.url="http://www.apache.org/licenses/LICENSE-2.0" \
+      maintainer="Nokia Wroclaw ONAP Team"
 
 ARG HV_VES_USER=hvves
+ARG HV_VES_GROUP=hvves
 ARG HV_VES_USER_ID_NUMBER=1410
 
-RUN apt-get update \
-        && apt-get install -y --no-install-recommends curl netcat \
-        && apt-get clean
+USER root
+RUN apk add --no-cache curl netcat-openbsd
+RUN addgroup $HV_VES_GROUP && adduser --system --disabled-password \
+    --no-create-home --uid ${HV_VES_USER_ID_NUMBER} --ingroup $HV_VES_GROUP $HV_VES_USER && \
+    mkdir -p /etc/ves-hv/ssl && \
+    mkdir -p /var/log/ONAP/dcae-hv-ves-collector/ && \
+    chown -R ${HV_VES_USER}:${HV_VES_GROUP} /etc/ves-hv /var/log/ONAP/ /opt && \
+    chmod g+s /opt /etc/ves-hv
 
 WORKDIR /opt/ves-hv-collector
 
-RUN useradd --user-group --uid ${HV_VES_USER_ID_NUMBER} ${HV_VES_USER}
-
-RUN mkdir -p /etc/ves-hv/ssl && chown -R ${HV_VES_USER} /etc/ves-hv/ssl
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/libs/external/* ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/libs/internal/* ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} src/main/docker/*.sh ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} src/main/docker/base.json /etc/ves-hv/configuration/base.json
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/hv-collector-main-*.jar ./
 
 USER ${HV_VES_USER}
 
 ENTRYPOINT ["./entry.sh"]
 CMD ["--configuration-file /etc/ves-hv/configuration/base.json"]
 
-COPY target/libs/external/* ./
-COPY target/libs/internal/* ./
-COPY src/main/docker/*.sh ./
-COPY src/main/docker/base.json /etc/ves-hv/configuration/base.json
-
-COPY target/hv-collector-main-*.jar ./
\ No newline at end of file

diff --git a/sources/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml
index 91d30c6..e208b80 100644 (file)
--- a/sources/hv-collector-main/pom.xml
+++ b/sources/hv-collector-main/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-main</artifactId>

diff --git a/sources/hv-collector-main/src/main/docker/entry.sh b/sources/hv-collector-main/src/main/docker/entry.sh
index a612e39..6bac5af 100755 (executable)
--- a/sources/hv-collector-main/src/main/docker/entry.sh
+++ b/sources/hv-collector-main/src/main/docker/entry.sh
@@ -1,20 +1,17 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
+#!/usr/bin/env sh
 
 pid=-1
 
-function handle_sigterm() {
-  if [[ ${pid} -ge 0 ]]; then
+handle_sigterm() {
+  if [ ${pid} -ge 0 ]; then
     echo "Caught SIGTERM signal. Redirecting to process with pid=${pid}"
     kill -TERM "${pid}"
     wait ${pid}
   fi
   exit 143 # 128 + 15 -- SIGTERM
 }
-trap "handle_sigterm" SIGTERM
-
-java ${JAVA_OPTS:-} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt $@ &
+trap "handle_sigterm" TERM
+java ${JAVA_OPTS} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt "$@" &
 pid=$!
 echo "Service started with pid=${pid}"
 wait ${pid}

diff --git a/sources/hv-collector-server/pom.xml b/sources/hv-collector-server/pom.xml
index a311c13..dddc4d0 100644 (file)
--- a/sources/hv-collector-server/pom.xml
+++ b/sources/hv-collector-server/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ssl/pom.xml b/sources/hv-collector-ssl/pom.xml
index 1e7a235..b2fdde4 100644 (file)
--- a/sources/hv-collector-ssl/pom.xml
+++ b/sources/hv-collector-ssl/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-test-utils/pom.xml b/sources/hv-collector-test-utils/pom.xml
index 67eee86..c991003 100644 (file)
--- a/sources/hv-collector-test-utils/pom.xml
+++ b/sources/hv-collector-test-utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml
index 83c41af..4a3948c 100644 (file)
--- a/sources/hv-collector-utils/pom.xml
+++ b/sources/hv-collector-utils/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml
index 3fe2a95..d27b351 100644 (file)
--- a/sources/hv-collector-ves-message-generator/pom.xml
+++ b/sources/hv-collector-ves-message-generator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-xnf-simulator/Dockerfile b/sources/hv-collector-xnf-simulator/Dockerfile
index 53e126b..c1fb60c 100644 (file)
--- a/sources/hv-collector-xnf-simulator/Dockerfile
+++ b/sources/hv-collector-xnf-simulator/Dockerfile
@@ -1,13 +1,12 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-LABEL copyright="Copyright (C) 2018 NOKIA"
-LABEL license.name="The Apache Software License, Version 2.0"
-LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
-LABEL maintainer="Nokia Wroclaw ONAP Team"
+LABEL copyright="Copyright (C) 2018 NOKIA" \
+      license.name="The Apache Software License, Version 2.0" \
+      license.url="http://www.apache.org/licenses/LICENSE-2.0" \
+      maintainer="Nokia Wroclaw ONAP Team"
 
-RUN apt-get update \
-        && apt-get install -y --no-install-recommends curl \
-        && apt-get clean
+USER root
+RUN apk add --no-cache curl
 
 WORKDIR /opt/ves-hv-client-simulator
 

diff --git a/sources/hv-collector-xnf-simulator/pom.xml b/sources/hv-collector-xnf-simulator/pom.xml
index 5c32e15..37c876c 100644 (file)
--- a/sources/hv-collector-xnf-simulator/pom.xml
+++ b/sources/hv-collector-xnf-simulator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/pom.xml b/sources/pom.xml
index 964ff45..e3c82dc 100644 (file)
--- a/sources/pom.xml
+++ b/sources/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>ves-hv-collector</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -126,7 +126,7 @@
                             <dependency>
                                 <groupId>${project.groupId}</groupId>
                                 <artifactId>hv-collector-analysis</artifactId>
-                                <version>1.8.0-SNAPSHOT</version>
+                                <version>1.9.0-SNAPSHOT</version>
                             </dependency>
                         </dependencies>
                     </plugin>

diff --git a/tools/development/docker-compose.yml b/tools/development/docker-compose.yml
index df8fee0..e278c97 100644 (file)
--- a/tools/development/docker-compose.yml
+++ b/tools/development/docker-compose.yml
@@ -79,7 +79,7 @@ services:
   #
 
   ves-hv-collector:
-    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.8.0-SNAPSHOT
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.9.0-SNAPSHOT
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
@@ -110,7 +110,7 @@ services:
   #
 
   xnf-simulator:
-    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator:1.8.0-SNAPSHOT
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator:1.9.0-SNAPSHOT
     ports:
       - "6062:6062/tcp"
       - "6063:6063"
@@ -134,7 +134,7 @@ services:
       - ../ssl/:/etc/ves-hv/
 
   dcae-app-simulator:
-    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.8.0-SNAPSHOT
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.9.0-SNAPSHOT
     ports:
       - "6064:6064/tcp"
     command: ["--listen-port", "6064",

diff --git a/version.properties b/version.properties
index 24828c2..a1653f6 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1
-minor=7
+minor=9
 patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}