From 85e7c7e57c262e38a0b3e0a14e4ebf4b92f00a58 Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Fri, 12 Apr 2019 18:59:42 +0000
Subject: Run as non-root

Change-Id: I25f5bf778b9878648bd305fa0de965e4e7ec718c
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1164
---
 dbc-client/misc/dbc-client               | 1 -
 dbc-client/pom.xml                       | 2 +-
 dbc-client/src/main/resources/Dockerfile | 6 ++++++
 dbc-client/version.properties            | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'dbc-client')

diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index 1e839ec..c29ec86 100644
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@ -25,7 +25,6 @@ umask 0022
 TZ=GMT0
 COMPONENT=dbc-client
 APP_ROOT=${APP_ROOT:-/opt/app/$COMPONENT}
-USER=root
 export TZ
 PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin
 export PATH
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 83c1d05..384d6a8 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -270,7 +270,7 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.0.6</artifact.version>
+    <artifact.version>1.0.7</artifact.version>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/dbc-client/src/main/resources/Dockerfile b/dbc-client/src/main/resources/Dockerfile
index 9baa481..85f9426 100644
--- a/dbc-client/src/main/resources/Dockerfile
+++ b/dbc-client/src/main/resources/Dockerfile
@@ -46,4 +46,10 @@ RUN chmod +x /opt/app/dbc-client/bin/* && \
 
 VOLUME /opt/app/dbc-client/log
 
+RUN addgroup -S -g 1001 onap \
+    && adduser -S -u 1000 dbc -G onap \
+    && chown -R dbc:onap /opt/
+
+USER dbc
+
 ENTRYPOINT ["sh", "./bin/dbc-client" ]
diff --git a/dbc-client/version.properties b/dbc-client/version.properties
index dadd8a9..0607bbf 100644
--- a/dbc-client/version.properties
+++ b/dbc-client/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=6
+patch=7
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
-- 
cgit