From fa76609ae0e8643f42a4b8728b4b14f3c50829ba Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Wed, 27 Jul 2016 14:56:04 +0200
Subject: [PATCH] Make builds with newest Ubuntu work

---
 Dockerfile       | 9 ++++++---
 supervisord.conf | 4 ++--
 ttrss.nginx.conf | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a023345..c7bdfdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,20 @@ 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 && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # 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
 RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
 RUN rm /etc/nginx/sites-enabled/default
 
+# php-fpm fails without this
+RUN mkdir -p /run/php/
+
 # install ttrss and patch configuration
 WORKDIR /var/www
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \
diff --git a/supervisord.conf b/supervisord.conf
index f117df0..43b0655 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -1,8 +1,8 @@
 [supervisord]
 nodaemon=true
 
-[program:php5-fpm]
-command=/usr/sbin/php5-fpm --nodaemonize
+[program:php-fpm]
+command=/usr/sbin/php-fpm7.0 --nodaemonize
 
 [program:nginx]
 command=/usr/sbin/nginx -g "daemon off;"
diff --git a/ttrss.nginx.conf b/ttrss.nginx.conf
index fa46f23..3a3c3ff 100644
--- a/ttrss.nginx.conf
+++ b/ttrss.nginx.conf
@@ -10,7 +10,7 @@ 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;
 	}