1
0

Add support for the newer Ubuntu.

- update PHP to version 7
    - update supervisor config accordingly
    - update nginx config accordingly
This commit is contained in:
Vitalii Vokhmin 2017-03-02 09:31:28 +02:00
parent adacce4ba1
commit 3d0026bad6
3 changed files with 8 additions and 5 deletions

View File

@ -2,11 +2,13 @@ FROM ubuntu
MAINTAINER Christian Lück <christian@lueck.tv>
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
nginx supervisor php5-fpm php5-cli php5-curl php5-gd php5-json \
php5-pgsql php5-mysql php5-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/*
nginx supervisor php-fpm php-cli php-curl php-gd php-json \
php-pgsql php-mysql php-mcrypt php-mbstring php-xml && apt-get clean && rm -rf /var/lib/apt/lists/* && \
phpenmod mcrypt && mkdir /run/php
# enable the mcrypt module
RUN php5enmod mcrypt
RUN phpenmod mcrypt
# add ttrss as the only nginx site
ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss

View File

@ -2,7 +2,7 @@
nodaemon=true
[program:php5-fpm]
command=/usr/sbin/php5-fpm --nodaemonize
command=/usr/sbin/php-fpm7.0 --nodaemonize
[program:nginx]
command=/usr/sbin/nginx -g "daemon off;"

View File

@ -10,9 +10,10 @@ server {
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/run/php/php7.0-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
}
}