X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-server%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=3226e472f7049c03569aa312caeba2b7e6d2f442;hb=53cb68740aa0cff8102f68c245f3db1289a92e01;hp=f2e486eb0fca718462733deb6af0c3db9b20b585;hpb=8ba2cee45f88c64d096dbbb29e73741403f747d1;p=ccsdk%2Fdistribution.git

diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile
index f2e486eb..3226e472 100644
--- a/saltstack-server/src/main/docker/Dockerfile
+++ b/saltstack-server/src/main/docker/Dockerfile
@@ -3,11 +3,19 @@ FROM centos:7
 
 RUN yum clean all && \
       yum install -y yum install epel-release && \
-      yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-1.el7.noarch.rpm && \
+      yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm && \
       yum update -y && \
       yum install -y sudo git tmux vim salt-master salt-minion && \
       yum clean all
 
 EXPOSE 4505 4506
 
-CMD /usr/bin/salt-master -d; /bin/bash
\ No newline at end of file
+# Create non root user
+RUN groupadd --system saltstack && useradd --system -g saltstack saltstack
+RUN chown -R saltstack /etc/salt /var/cache/salt /var/log/salt
+RUN mkdir /var/run/salt && chown saltstack:saltstack /var/run/salt
+
+USER saltstack
+
+# Run salt-master in foreground (not as a daemon)
+CMD /usr/bin/salt-master
\ No newline at end of file