diff --git a/Dockerfile b/Dockerfile index 760ad97..970f7dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM debian:jessie MAINTAINER Ric Harvey # Surpress Upstart errors/warning @@ -11,8 +11,12 @@ ENV DEBIAN_FRONTEND noninteractive # Add sources for latest nginx RUN apt-get install -y wget RUN wget -q http://nginx.org/keys/nginx_signing.key -O- | sudo apt-key add - -RUN echo deb http://nginx.org/packages/mainline/ubuntu/ trusty nginx >> /etc/apt/sources.list -RUN echo deb-src http://nginx.org/packages/mainline/ubuntu/ trusty nginx >> /etc/apt/sources.list +RUN echo deb http://nginx.org/packages/mainline/debian/ trusty nginx >> /etc/apt/sources.list +RUN echo deb-src http://nginx.org/packages/mainline/debian/ trusty nginx >> /etc/apt/sources.list + +# Add PHP packages from dotdeb +RUN echo deb http://packages.dotdeb.org wheezy-php56 all >> /etc/apt/sources.list +RUN echo deb-src http://packages.dotdeb.org wheezy-php56 all >> /etc/apt/sources.list # Update System RUN apt-get update diff --git a/supervisord.conf b/supervisord.conf index e908f8c..b60ebfa 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,6 +1,5 @@ [unix_http_server] file=/tmp/supervisor.sock ; (the path to the socket file) -chmod=700 [supervisord] logfile=/tmp/supervisord.log ; (main log file;default $CWD/supervisord.log) @@ -23,18 +22,15 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket [program:php5-fpm] -command=/usr/sbin/php5-fpm -c /etc/php5/fpm +commaind=/usr/sbin/php5-fpm -c /etc/php5/fpm +autostart=true +autorestart=true priority=5 -stdout_events_enabled=true -stderr_events_enabled=true - -[program:php5-fpm-log] -command=tail -f /var/log/php5-fpm.log -priority=999 -stdout_events_enabled=true [program:nginx] command=/usr/sbin/nginx +autostart=true +autorestart=true priority=10 stdout_events_enabled=true stderr_events_enabled=true