diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-09-01 16:21:53 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-09-01 16:24:53 -0400 |
| commit | 0b9839e70cb6a3ba1328f37792d33cd1896309ef (patch) | |
| tree | 0015f5c1e97ae2f0a2f05e072aa375eb1f7b4806 /saltstack-server | |
| parent | 884302ca87b0544c885d4eb7a95eab3a9593483d (diff) | |
Update to use ONAP standard base images
Updated all containers to use one of the 2 approved ONAP base images:
- onap/integration-java11
- onap/integration-python
Change-Id: I961e9af38d790f74528a726a0fc68d1a2e5fbfb9
Issue-ID: CCSDK-2418
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'saltstack-server')
| -rw-r--r-- | saltstack-server/src/main/docker/Dockerfile | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile index 3226e472..710d45d7 100644 --- a/saltstack-server/src/main/docker/Dockerfile +++ b/saltstack-server/src/main/docker/Dockerfile @@ -1,21 +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 # 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 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) -CMD /usr/bin/salt-master
\ No newline at end of file +ENTRYPOINT [ "/usr/bin/salt-master" ]
\ No newline at end of file |