aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hwang <mhwang@research.att.com>2019-07-16 10:31:51 -0400
committerMichael Hwang <mhwang@research.att.com>2019-07-18 00:25:39 -0400
commit7b82b5302f6319f7192c96aebdaaf16bfa1024d7 (patch)
treed11b95a74edeef44f3ad067374e0269f5b8d2df1
parente8e64c41b1da24273ab4568fcbe4c2f4683c53f3 (diff)
Change base image to alpine based5.0.0-ONAP
Change-Id: If201abe897c49f9dda93ccad8f57f0679604dcc7 Issue-ID: DCAEGEN2-1565 Signed-off-by: Michael Hwang <mhwang@research.att.com>
-rw-r--r--CHANGELOG.md5
-rw-r--r--pom.xml9
-rw-r--r--version.properties2
3 files changed, 9 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52ac665..1bc6986 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
The version in the brackets represents the version of DCAE inventory and not the ONAP DCAE version.
-## [Dev]
+## [3.4.0]
-* Add non-root user in Docker image so that the inventory service can be run in non-privileged mode for security reasons
+* Add non-root user in Docker image so that the inventory service can be run in non-privileged mode for security reasons DCAEGEN2-1554
+* Change base image to alpine based DCAEGEN2-1565
## [3.0.1]
diff --git a/pom.xml b/pom.xml
index 282659d..11e05d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
================================================================================
-Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2019 AT&T Intellectual Property. 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.
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>inventory-api</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>dcaegen2-platform-inventory-api</name>
<!--internal <version>3.0.0</version>-->
@@ -342,10 +342,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<version>1.0.0</version>
<configuration>
<imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
- <baseImage>openjdk:8-jre</baseImage>
+ <baseImage>openjdk:8-jre-alpine</baseImage>
<user>inventory</user>
<runs>
- <run>adduser --system --group inventory</run>
+ <run>addgroup -S inventory</run>
+ <run>adduser -S -G inventory inventory</run>
</runs>
<entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
<resources>
diff --git a/version.properties b/version.properties
index 92866fb..1ba9fb5 100644
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
major=3
-minor=3
+minor=4
patch=0
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins