summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Mazuruk <a.mazuruk@samsung.com>2021-02-18 17:25:57 +0100
committerAlexander Mazuruk <a.mazuruk@samsung.com>2021-03-25 00:16:50 +0100
commitbc8f2ecef242b962e49f0498b7436917759f558b (patch)
tree1a1acadf7bd314a02b129db9d00291df8b6c9732
parent2a19d427095ab30ef636409ff50031e9e1490ff6 (diff)
Change openjdk baseOS img to integration-java111.6.0
Since 7.2.0 integration images switched over to alpine, adjusted Dockerfile to accomodate the switch. 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: I6c3fc2aae136a7f361a7e15cb52b75931392f34a
-rw-r--r--Changelog.md4
-rw-r--r--pom.xml3
-rw-r--r--prh-app-server/Dockerfile7
-rw-r--r--prh-app-server/pom.xml3
-rw-r--r--prh-commons/pom.xml3
-rw-r--r--version.properties4
6 files changed, 16 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md
index 444ed1a5..704e46a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [1.6.0] - 25/02/2021
+### Changed
+- Change Docker's base image to integration-java11
+
## [1.5.6] - 10/02/2021
### Changed
- Updated to use DCAE-SDK 1.6.0
diff --git a/pom.xml b/pom.xml
index 5e4652d7..143a9436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,7 @@
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ 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.
@@ -32,7 +33,7 @@
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>dcaegen2-services-prh</name>
<description>PNF Registration Handler</description>
diff --git a/prh-app-server/Dockerfile b/prh-app-server/Dockerfile
index d92dae8f..fb762ec3 100644
--- a/prh-app-server/Dockerfile
+++ b/prh-app-server/Dockerfile
@@ -1,12 +1,13 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
LABEL copyright="Copyright (C) 2018-2020 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 useradd --user-group --uid ${docker.user.id} -d ${docker.user.dir} ${docker.user.name}; \
-chmod -R a+w /var/log
+USER root
+RUN adduser --disabled-password --uid ${docker.user.id} --home ${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 2589c86e..9173ed39 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -4,6 +4,7 @@
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ 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.
@@ -26,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.prh</groupId>
diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml
index 8de00baa..9cc3539f 100644
--- a/prh-commons/pom.xml
+++ b/prh-commons/pom.xml
@@ -4,6 +4,7 @@
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ 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.
@@ -26,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.prh</groupId>
diff --git a/version.properties b/version.properties
index be999e8e..eabef1f2 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
-minor=5
-patch=6
+minor=6
+patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT