X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=saltstack-server%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=da4e25dbe784dbfb955832f235eb86280a2d6b5a;hb=refs%2Fheads%2Fmaster;hp=3226e472f7049c03569aa312caeba2b7e6d2f442;hpb=38e175fa6762c27b85df450002e6458d9b0a41d6;p=ccsdk%2Fdistribution.git

diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile
index 3226e472..da4e25db 100644
--- a/saltstack-server/src/main/docker/Dockerfile
+++ b/saltstack-server/src/main/docker/Dockerfile
@@ -1,21 +1,22 @@
-FROM centos:7
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
+LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
+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
-
-EXPOSE 4505 4506
+#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
 
 # 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
+RUN addgroup -S saltstack && adduser -S saltstack -G saltstack \
+    && mkdir -p /var/run/salt /var/cache/salt \
+    && chown -R saltstack:saltstack /etc/salt /var/log/salt /var/run/salt /var/cache/salt
 
-USER saltstack
 
-# Run salt-master in foreground (not as a daemon)
-CMD /usr/bin/salt-master
\ No newline at end of file
+USER saltstack
+EXPOSE 4505 4506
+ENTRYPOINT [ "/usr/bin/salt-master" ]