From c3240af7248241bc15e5a08dacb66e8bc097b35c Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Sat, 17 Jul 2021 14:29:10 -0400 Subject: Cleaning up Dockerfiles Issue-ID: CCSDK-3226 Signed-off-by: Singal, Kapil (ks220y) Change-Id: If902c2245e52e8cb911b3cb8fc5e78ded0ed3782 --- saltstack-server/src/main/docker/Dockerfile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'saltstack-server/src/main/docker') diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile index 710d45d7..da4e25db 100644 --- a/saltstack-server/src/main/docker/Dockerfile +++ b/saltstack-server/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ -#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 && \ @@ -11,16 +11,12 @@ RUN apk add git tmux vim salt-master salt-minion # yum install -y sudo git tmux vim salt-master salt-minion && \ # yum clean all -EXPOSE 4505 4506 - # 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 +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) -ENTRYPOINT [ "/usr/bin/salt-master" ] \ No newline at end of file +USER saltstack +EXPOSE 4505 4506 +ENTRYPOINT [ "/usr/bin/salt-master" ] -- cgit 1.2.3-korg