Merge pull request #59 from tomwilkie/runit

Use runit inside the scope container

Makefile

@@ -34,7 +34,7 @@ $(APP_EXE) $(PROBE_EXE):
 $(FIXPROBE_EXE):
 	cd experimental/fixprobe && go build
 
-$(SCOPE_EXPORT):  $(APP_EXE) $(PROBE_EXE) docker/Dockerfile docker/entrypoint.sh docker/supervisord.conf
+$(SCOPE_EXPORT):  $(APP_EXE) $(PROBE_EXE) docker/Dockerfile docker/entrypoint.sh
 	cp $(APP_EXE) $(PROBE_EXE) docker/
 	$(SUDO) docker build -t $(SCOPE_IMAGE) docker/
 	$(SUDO) docker save $(SCOPE_IMAGE):latest > $@

docker/Dockerfile

@@ -1,11 +1,13 @@
 FROM gliderlabs/alpine
 MAINTAINER Weaveworks Inc <help@weave.works>
 WORKDIR /home/weave
-RUN apk add --update supervisor
-RUN ["sh", "-c", "rm -rf /var/cache/apk/*"]
-ADD supervisord.conf /etc/
 ADD ./app /home/weave/
 ADD ./probe /home/weave/
 ADD ./entrypoint.sh /home/weave/
+ADD ./run-app /etc/service/app/run
+ADD ./run-probe /etc/service/probe/run
+
+RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >>/etc/apk/repositories && apk add --update runit
+
 EXPOSE 4040
 ENTRYPOINT ["/home/weave/entrypoint.sh"]

docker/entrypoint.sh

@@ -41,4 +41,4 @@ if [ -n "$HOSTNAME" ]; then
     hostname -F /etc/hostname
 fi
 
-/usr/bin/supervisord -c /etc/supervisord.conf
+exec /sbin/runsvdir /etc/service

docker/run-app

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /home/weave/app

docker/run-probe

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /home/weave/probe

docker/supervisord.conf

@@ -1,16 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:app]
-command=/home/weave/app
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:probe]
-command=/home/weave/probe -proc.root=/hostproc
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0