瀏覽代碼

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

Build docker images on PHP 7.2 base image
daniel 6 年之前
父節點
當前提交
b16ee2beba
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      README.md
  2. 1 1
      contrib/docker/Dockerfile.apache
  3. 1 1
      contrib/docker/Dockerfile.fpm

+ 1 - 1
README.md

@@ -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

+ 1 - 1
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_VERSION="1.6.5"
 ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"
 ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"

+ 1 - 1
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_VERSION="1.6.5"
 ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"
 ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"