Update docker base image to java 11

Top up DCAE SDK version in project

Issue-ID: DCAEGEN2-1983
Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com>
Change-Id: I3b31454a5bc3ff2011f6ba44e6272e8937d88c6d

diff --git a/pom.xml b/pom.xml
index 57cfd72..fb0866c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
     <springfox.version>2.9.2</springfox.version>
     <immutables.version>2.7.5</immutables.version>
-    <sdk.version>1.3.3</sdk.version>
+    <sdk.version>1.3.4</sdk.version>
   </properties>
 
   <modules>

diff --git a/prh-app-server/Dockerfile b/prh-app-server/Dockerfile
index a72ab44..22a9b46 100644 (file)
--- a/prh-app-server/Dockerfile
+++ b/prh-app-server/Dockerfile
@@ -1,12 +1,12 @@
-FROM openjdk:8-jre-alpine
+FROM docker.io/openjdk:11-jre-slim
 
 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"
 
-RUN adduser -h ${docker.user.dir} -D ${docker.user.name}; \
-    chmod -R a+w /var/log
+RUN useradd --user-group --uid ${docker.user.id} -d ${docker.user.dir} ${docker.user.name}; \
+chmod -R a+w /var/log
 
 USER ${docker.user.name}
 WORKDIR ${docker.user.dir}

diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index 268bb5e..1271399 100644 (file)
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -45,6 +45,7 @@
     <skipDocker>false</skipDocker>
     <docker.user.name>prh</docker.user.name>
     <docker.user.dir>/home/${docker.user.name}</docker.user.dir>
+    <docker.user.id>1414</docker.user.id>
   </properties>
 
   <build>

diff --git a/version.properties b/version.properties
index 9e0d73d..68bc8f5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1
-minor=4
+minor=5
 patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}