From e3184fb92637badbbf18fbaf3fada29412a59c77 Mon Sep 17 00:00:00 2001
From: Alexander Mazuruk <a.mazuruk@samsung.com>
Date: Thu, 18 Feb 2021 17:09:53 +0100
Subject: 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
---
 sources/hv-collector-dcae-app-simulator/Dockerfile | 15 +++++++--------
 sources/hv-collector-dcae-app-simulator/pom.xml    |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'sources/hv-collector-dcae-app-simulator')

diff --git a/sources/hv-collector-dcae-app-simulator/Dockerfile b/sources/hv-collector-dcae-app-simulator/Dockerfile
index a561fff7..ae229080 100644
--- 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 797a70a1..f3926515 100644
--- 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>
 
-- 
cgit 1.2.3-korg