UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-20 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #693 from hnrd/fix/php7.2

Browse source 
Build docker images on PHP 7.2 base image
This commit is contained in:
daniel 2018-12-27 01:15:53 -07:00 committed by GitHub
commit b16ee2beba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ there is a stable release**. The following setup instructions are intended for
testing and development. testing and development.
## Requirements ## 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) - MySQL >= 5.7, Postgres (MariaDB and sqlite are not supported yet)
- Redis - Redis
- Composer - Composer

2
contrib/docker/Dockerfile.apache
View file

@ -1,4 +1,4 @@
FROM php:7-apache FROM php:7.2-apache
ARG COMPOSER_VERSION="1.6.5" ARG COMPOSER_VERSION="1.6.5"
ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"

2
contrib/docker/Dockerfile.fpm
View file

@ -1,4 +1,4 @@
FROM php:7-fpm FROM php:7.2-fpm
ARG COMPOSER_VERSION="1.6.5" ARG COMPOSER_VERSION="1.6.5"
ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"