Skip to content

Commit f14b35d

Browse files
vagrantvagrant
vagrant
authored and
vagrant
committed
Adding an initial salt-master example
1 parent f813356 commit f14b35d

File tree

4 files changed

+38
-1
lines changed

4 files changed

+38
-1
lines changed

mongodb.docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MAINTAINER Kimbro Staken
55

66
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
77
RUN echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | tee -a /etc/apt/sources.list.d/10gen.list
8-
RUN apt-get -y update
8+
RUN apt-get update
99
RUN apt-get -y install mongodb-10gen
1010

1111
#RUN echo "" >> /etc/mongodb.conf

salt-master/Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ubuntu
2+
MAINTAINER Kimbro Staken
3+
4+
RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
5+
RUN apt-get update
6+
7+
RUN apt-get install -y wget sudo supervisor
8+
9+
RUN apt-get install -y python-software-properties
10+
RUN add-apt-repository ppa:saltstack/salt
11+
RUN apt-get update
12+
13+
# Keep upstart from complaining
14+
RUN dpkg-divert --local --rename --add /sbin/initctl
15+
RUN ln -s /bin/true /sbin/initctl
16+
17+
RUN apt-get install -y salt-master openssh-server
18+
19+
RUN echo "root:salt-stack" | chpasswd
20+
RUN mkdir -p -m0755 /var/run/sshd
21+
22+
ADD ./supervisor-salt.conf /etc/supervisor/conf.d/
23+
24+
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]

salt-master/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Includes the Salt Master and sshd.
2+

salt-master/supervisor-salt.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[program:salt-master]
2+
command=/usr/bin/salt-master
3+
numprocs=1
4+
autostart=true
5+
autorestart=true
6+
7+
[program:sshd]
8+
command=/usr/sbin/sshd -D
9+
numprocs=1
10+
autostart=true
11+
autorestart=true

0 commit comments

Comments
 (0)