X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-server%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=710d45d7f95d566887dc58b85b04a78890f55ec1;hb=0b9839e70cb6a3ba1328f37792d33cd1896309ef;hp=eeebef4c5e9bf91b3bb26d90f0e0caf61235d2a0;hpb=68920855048f006e83040c63dcd1acc708c1caff;p=ccsdk%2Fdistribution.git

diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile
index eeebef4c..710d45d7 100644
--- a/saltstack-server/src/main/docker/Dockerfile
+++ b/saltstack-server/src/main/docker/Dockerfile
@@ -1,13 +1,26 @@
-FROM centos:7
+#FROM centos:7
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
 
+USER root
+RUN apk add git tmux vim salt-master salt-minion
 
-RUN yum clean all && \
-      yum install -y yum install epel-release && \
-      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
+#RUN yum clean all && \
+#      yum install -y yum install epel-release && \
+#      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
+# Create non root user
+RUN addgroup -S saltstack && adduser -S saltstack -G saltstack
+# RUN groupadd --system saltstack && useradd --system -g saltstack saltstack
+RUN chown -R saltstack /etc/salt /var/log/salt
+RUN mkdir /var/run/salt && chown saltstack:saltstack /var/run/salt
+RUN mkdir /var/cache/salt && chown saltstack:saltstack /var/cache/salt
+
+USER saltstack
+
+# Run salt-master in foreground (not as a daemon)
+ENTRYPOINT [ "/usr/bin/salt-master" ]
\ No newline at end of file