Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix saltstack-server docker build
[ccsdk/distribution.git]
/
saltstack-server
/
src
/
main
/
docker
/
Dockerfile
diff --git
a/saltstack-server/src/main/docker/Dockerfile
b/saltstack-server/src/main/docker/Dockerfile
index
f2e486e
..
eeebef4
100644
(file)
--- a/
saltstack-server/src/main/docker/Dockerfile
+++ b/
saltstack-server/src/main/docker/Dockerfile
@@
-3,11
+3,11
@@
FROM centos:7
RUN yum clean all && \
yum install -y yum install epel-release && \
RUN yum clean all && \
yum install -y yum install epel-release && \
- yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-
1
.el7.noarch.rpm && \
+ 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
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
\ No newline at end of file
+CMD /usr/bin/salt-master -d; /bin/bash