bunix42/docker-ttrss
1
0
Fork 0
Code Releases Activity

Merge b478b4cb9878b1b3e9470880f003d1e077f239ec into adacce4ba156ad35a1386fe1b8c19bd929e420f8

Browse Source
This commit is contained in:
Ruben Vermeersch 2016-07-27 13:29:11 +00:00 committed by GitHub
commit 6d10c8ed09
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -1,18 +1,21 @@
FROM ubuntu FROM ubuntu:xenial
MAINTAINER Christian Lück <christian@lueck.tv> MAINTAINER Christian Lück <christian@lueck.tv>
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
nginx supervisor php5-fpm php5-cli php5-curl php5-gd php5-json \ nginx supervisor php-fpm php-cli php-curl php-gd php-json \
php5-pgsql php5-mysql php5-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/* php-pgsql php-mysql php-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/*
# enable the mcrypt module # enable the mcrypt module
RUN php5enmod mcrypt RUN phpenmod mcrypt
# add ttrss as the only nginx site # add ttrss as the only nginx site
ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
RUN rm /etc/nginx/sites-enabled/default RUN rm /etc/nginx/sites-enabled/default
# php-fpm fails without this
RUN mkdir -p /run/php/
# install ttrss and patch configuration # install ttrss and patch configuration
WORKDIR /var/www WORKDIR /var/www
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \

4
supervisord.conf
View File

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

2
ttrss.nginx.conf
View File

@ -10,7 +10,7 @@ server {
location ~ \.php$ { location ~ \.php$ {
fastcgi_split_path_info ^(.+\.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; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
} }