From 1239fd17d6ccea744ae4c8f740630acc2e0412b8 Mon Sep 17 00:00:00 2001 From: hnrd Date: Wed, 26 Dec 2018 20:50:58 +0100 Subject: [PATCH 1/2] pin docker images to PHP 7.2 --- contrib/docker/Dockerfile.apache | 2 +- contrib/docker/Dockerfile.fpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 7f4b8742d..1bd5961e0 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -1,4 +1,4 @@ -FROM php:7-apache +FROM php:7.2-apache ARG COMPOSER_VERSION="1.6.5" ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 6c7822ea0..93676b10e 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -1,4 +1,4 @@ -FROM php:7-fpm +FROM php:7.2-fpm ARG COMPOSER_VERSION="1.6.5" ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" From bc6256c28e25ecfbed18d049bf99a31daff99900 Mon Sep 17 00:00:00 2001 From: hnrd Date: Wed, 26 Dec 2018 20:51:47 +0100 Subject: [PATCH 2/2] Require PHP < 7.3 for Pixelfed to work. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b9684e9b..a2520a39e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ there is a stable release**. The following setup instructions are intended for testing and development. ## Requirements - - PHP >= 7.1.3 (7.2+ recommended for stable version) + - PHP >= 7.1.3 < 7.3 (7.2.x recommended for stable version) - MySQL >= 5.7, Postgres (MariaDB and sqlite are not supported yet) - Redis - Composer