From 095d9fdd1a0073cc0e79229dcfb88a5ba7b2dbbd Mon Sep 17 00:00:00 2001 From: Sam Dodrill Date: Sat, 9 Aug 2014 21:53:58 -0700 Subject: [PATCH] Dockerfile: change to use deis/init --- Dockerfile | 7 +++---- extra/runit/run | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100755 extra/runit/run diff --git a/Dockerfile b/Dockerfile index 7f7bb42..e17d05e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM deis/init MAINTAINER Xena # Update base system @@ -13,6 +13,7 @@ RUN mkdir /home/ircd/src RUN chmod 777 /home/ircd/src ADD . /home/ircd/src +ADD extra/runit/ /etc/service/ircd/ RUN cd /home/ircd/src; ./configure --prefix=/home/ircd/run ; make ; make install ADD doc/example.conf /home/ircd//run/etc/ircd.conf @@ -20,7 +21,5 @@ ADD doc/example.conf /home/ircd//run/etc/ircd.conf RUN chmod -R 777 /home/ircd/run EXPOSE 6667 -USER ircd - -CMD /home/ircd/run/bin/ircd -foreground +ENTRYPOINT /sbin/my_init diff --git a/extra/runit/run b/extra/runit/run new file mode 100755 index 0000000..ea2ce9a --- /dev/null +++ b/extra/runit/run @@ -0,0 +1,3 @@ +#!/bin/sh + +setuser ircd /home/ircd/run/bin/ircd -foreground