From: edepaul <paul.p.dennehy@est.tech>
Date: Mon, 1 Apr 2019 16:41:53 +0000 (+0000)
Subject: Update dating dockerfiles for non root containers
X-Git-Tag: 2.1.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=b4350f96ad8ad5f4377831be13e5ebe367eb183b

Update dating dockerfiles for non root containers

Issue-ID: DMAAP-1134

Change-Id: I7dcc5b6754fc157dea3abfc2e19a2a07ce509760
Signed-off-by: edepaul <paul.p.dennehy@est.tech>
---

diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile
index 39007732..d57fbef5 100644
--- a/datarouter-node/src/main/resources/docker/Dockerfile
+++ b/datarouter-node/src/main/resources/docker/Dockerfile
@@ -25,10 +25,16 @@ MAINTAINER DMAAP Team
 COPY /opt /opt
 
 # curl used for healthcheck
-CMD apt update && apt add curl
+RUN apk update && apk add curl && apk add vim
 
 EXPOSE 8080 8443
 
 WORKDIR /opt
 RUN chmod 0700 startup.sh
 ENTRYPOINT ["sh", "startup.sh"]
+
+RUN addgroup -S onap \
+    && adduser -S datarouter -G onap \
+    && chown -R datarouter:onap /opt/
+
+USER datarouter
\ No newline at end of file
diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile
index b11925a0..fb512a4b 100644
--- a/datarouter-prov/src/main/resources/docker/Dockerfile
+++ b/datarouter-prov/src/main/resources/docker/Dockerfile
@@ -24,10 +24,17 @@ MAINTAINER DMAAP Team
 
 COPY /opt /opt
 
-RUN apk update && apk add curl
+RUN apk update && apk add curl && apk add vim
 
 EXPOSE 8080 8443
 
 WORKDIR /opt
 RUN chmod 0700 startup.sh
+
 ENTRYPOINT ["sh", "startup.sh"]
+
+RUN addgroup -S onap \
+    && adduser -S datarouter -G onap \
+    && chown -R datarouter:onap /opt/
+
+USER datarouter
diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile
index fe6d2fc3..7892ff75 100644
--- a/datarouter-subscriber/src/main/resources/docker/Dockerfile
+++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile
@@ -29,3 +29,9 @@ EXPOSE 8080 8443
 WORKDIR /opt
 RUN chmod 0700 startup.sh
 ENTRYPOINT ["sh", "startup.sh"]
+
+RUN addgroup -S onap \
+    && adduser -S datarouter -G onap \
+    && chown -R datarouter:onap /opt/
+
+USER datarouter
\ No newline at end of file