Building debian branch

This commit is contained in:
Ric Harvey
2015-07-10 14:49:20 +01:00
parent 2803363c8d
commit a026b88901
2 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
FROM ubuntu:14.04
FROM debian:jessie
MAINTAINER Ric Harvey <ric@ngineered.co.uk>
# 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

View File

@@ -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