From 7516021cd09c8eba5e87c45f8e6235658eaebbf1 Mon Sep 17 00:00:00 2001 From: Hanjo Meinhardt Date: Wed, 22 May 2019 18:24:25 +0200 Subject: [PATCH] make the image work again --- Dockerfile | 5 +++-- ttrss.nginx.conf | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83ac19a..28accfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,9 @@ WORKDIR /var/www #RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \ # && apt-get purge -y --auto-remove curl \ -RUN curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /var/www --strip-components 1 \ - && cp config.php-dist config.php \ +RUN curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /var/www --strip-components 1 + +RUN cp config.php-dist config.php \ && chown www-data:www-data -R /var/www \ && mkdir /var/run/php diff --git a/ttrss.nginx.conf b/ttrss.nginx.conf index fa46f23..d98b3d8 100644 --- a/ttrss.nginx.conf +++ b/ttrss.nginx.conf @@ -8,9 +8,20 @@ server { try_files $uri $uri/ =404; } + location ~ \.php$ { + fastcgi_split_path_info ^(.*\.php)(/.*)?$; + fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + } + location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; fastcgi_index index.php; include fastcgi_params; }