X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=search-data-service-app%2Fsrc%2Fmain%2Fdocker%2FDockerfile;fp=search-data-service-app%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=a40ae7ffbb88a829eca446f8b435ec9484460de9;hb=ad62cb85753c889ba5c163ac7ba5b87f6fe1ded0;hp=45ef1854eaa02e4b988d89c3e07d657758a6334c;hpb=c0b5ae3da32a2ac942781c71684d7466741cee6a;p=aai%2Fsearch-data-service.git

diff --git a/search-data-service-app/src/main/docker/Dockerfile b/search-data-service-app/src/main/docker/Dockerfile
index 45ef185..a40ae7f 100644
--- a/search-data-service-app/src/main/docker/Dockerfile
+++ b/search-data-service-app/src/main/docker/Dockerfile
@@ -2,6 +2,8 @@ FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/search-data-service
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG SD_LOGS=/var/log/onap/AAI-SDB
+
 #AAI-2179 Additional optional steps for Ubuntu
 RUN if  ((uname -v | grep -i "ubuntu") || ( cat /etc/*release|grep -i "ubuntu")      ) ; then \
    #####################################
@@ -17,26 +19,23 @@ RUN if  ((uname -v | grep -i "ubuntu") || ( cat /etc/*release|grep -i "ubuntu")
      JAVA_HOME=usr/lib/jvm/java-8-openjdk-amd64; \
      export JAVA_HOME ; \
    fi; \
-   ##########################################
-   #Install gosu if not present
-   ##########################################
-   if type  gosu   2>/dev/null; then \
-     echo "skipping gosu installation"; \
-   else \
-     set -x ; \
-     add-apt-repository -y ppa:tianon/gosu; \
-     sudo apt-get update; \
-     sudo apt-get install gosu; \
-   fi;\
 fi
 
 # Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME $USERS_HOME /logs
+RUN mkdir -p $MICRO_HOME $USERS_HOME /logs $MICRO_HOME/bundleconfig/etc $BIN_HOME $SD_LOGS
+
+RUN groupadd aaiadmin -g 1000
+RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+
 WORKDIR $MICRO_HOME
-RUN mkdir -p $MICRO_HOME/bundleconfig/etc
-RUN mkdir -p $BIN_HOME
+
+RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs $SD_LOGS
+
 # copy everything from search-data-service-app/target/docker/nexus3.onap.org/10003/onap/search-data-service/latest/build/maven/search-data-service-app
-COPY /maven/search-data-service-app/ .
+COPY --chown=aaiadmin:aaiadmin /maven/search-data-service-app/ .
+
+USER aaiadmin
+
 RUN chmod -R 755 $BIN_HOME/* $MICRO_HOME/*
 RUN ln -snf /logs $MICRO_HOME/logs