move non-root id run for CDT container

add cdt:cdt to Dockerfile
change port 80 to 18080 for non-root
user

Change-Id: I694cfaed85396d8f4f527d33e8e507e6d7a64178
Issue-ID: APPC-1519
Signed-off-by: Taka Cho <takamune.cho@att.com>

diff --git a/cdt/src/main/docker/Dockerfile b/cdt/src/main/docker/Dockerfile
index dc2d1ed..4fe3d4f 100644 (file)
--- a/cdt/src/main/docker/Dockerfile
+++ b/cdt/src/main/docker/Dockerfile
@@ -23,6 +23,14 @@
 FROM httpd:2.4-alpine
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
-COPY config-design-tool /usr/local/apache2/htdocs/
+RUN sed -i -e "s/80/18080/" /usr/local/apache2/conf/httpd.conf; \
+addgroup -S cdt && adduser -S cdt -G cdt
 
-COPY startCdt.sh /opt/startCdt.sh
+COPY --chown=cdt:cdt config-design-tool /usr/local/apache2/htdocs/
+
+COPY --chown=cdt:cdt startCdt.sh /opt/startCdt.sh
+
+RUN chown -R cdt:cdt /opt; \
+chown -R cdt:cdt /usr/local/apache2
+
+USER cdt:cdt

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b175061..809bc57 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -126,7 +126,7 @@ services:
     entrypoint:
        - "/opt/startCdt.sh"
     ports:
-      - "8080:80"
+      - "8080:18080"
     links:
       - appc:sdnhost
     environment: