diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-07-17 14:29:10 -0400 |
|---|---|---|
| committer | KAPIL SINGAL <ks220y@att.com> | 2021-07-17 20:54:09 +0000 |
| commit | c3240af7248241bc15e5a08dacb66e8bc097b35c (patch) | |
| tree | 8a5b7193bb138900909a6d21fd693acd428189f1 /saltstack-server/src/main | |
| parent | cf4d991f8f0dad96373616e7b6c9747e077d7643 (diff) | |
Cleaning up Dockerfiles
Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: If902c2245e52e8cb911b3cb8fc5e78ded0ed3782
Diffstat (limited to 'saltstack-server/src/main')
| -rw-r--r-- | saltstack-server/src/main/docker/Dockerfile | 20 |
1 files changed, 8 insertions, 12 deletions
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" ] |