From 8599ab2f5ca3e384b2a9254ae951bbc3850e1106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0ime=C4=8Dek?= Date: Tue, 5 Dec 2017 13:24:42 +0100 Subject: [PATCH] PHP 7.2! --- {7.2-rc => 7.2}/fpm/Dockerfile | 2 +- {7.2-rc => 7.2}/fpm/config/php.ini | 0 {7.2-rc => 7.2}/zts/Dockerfile | 2 +- {7.2-rc => 7.2}/zts/config/php.ini | 0 README.md | 9 ++++----- 5 files changed, 6 insertions(+), 7 deletions(-) rename {7.2-rc => 7.2}/fpm/Dockerfile (98%) rename {7.2-rc => 7.2}/fpm/config/php.ini (100%) rename {7.2-rc => 7.2}/zts/Dockerfile (98%) rename {7.2-rc => 7.2}/zts/config/php.ini (100%) diff --git a/7.2-rc/fpm/Dockerfile b/7.2/fpm/Dockerfile similarity index 98% rename from 7.2-rc/fpm/Dockerfile rename to 7.2/fpm/Dockerfile index 7e9951c..332f300 100644 --- a/7.2-rc/fpm/Dockerfile +++ b/7.2/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-rc-fpm +FROM php:7.2-fpm LABEL maintainer="Jiří Šimeček " diff --git a/7.2-rc/fpm/config/php.ini b/7.2/fpm/config/php.ini similarity index 100% rename from 7.2-rc/fpm/config/php.ini rename to 7.2/fpm/config/php.ini diff --git a/7.2-rc/zts/Dockerfile b/7.2/zts/Dockerfile similarity index 98% rename from 7.2-rc/zts/Dockerfile rename to 7.2/zts/Dockerfile index ad8e07b..0e93c3f 100644 --- a/7.2-rc/zts/Dockerfile +++ b/7.2/zts/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-rc-zts +FROM php:7.2-zts LABEL maintainer="Jiří Šimeček " diff --git a/7.2-rc/zts/config/php.ini b/7.2/zts/config/php.ini similarity index 100% rename from 7.2-rc/zts/config/php.ini rename to 7.2/zts/config/php.ini diff --git a/README.md b/README.md index 006bb7c..f557f71 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # PHP fpm & zts ## Supported tags and respective `Dockerfile` links -* `7.2-rc-fpm` [(7.2-rc/fpm/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.2-rc/fpm/Dockerfile) -* `7.2-rc-zts` [(7.2-rc/zts/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.2-rc/zts/Dockerfile) -* `7.1-fpm`, `7-fpm`, `latest` [(7.1/fpm/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.1/fpm/Dockerfile) +* `7.2-fpm`, `7-fpm`, `latest` [(7.2/fpm/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.2/fpm/Dockerfile) +* `7.2-zts` [(7.2/zts/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.2/zts/Dockerfile) +* `7.1-fpm` [(7.1/fpm/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.1/fpm/Dockerfile) * `7.1-zts` [(7.1/zts/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/7.1/zts/Dockerfile) * `5.6-fpm`, `5-fpm` [(5.6/fpm/Dockerfile)](https://github.com/Shimmi/docker-php/blob/master/5.6/fpm/Dockerfile) @@ -23,5 +23,4 @@ Please refer to the repo's Wiki to see the [changelog](https://github.com/Shimmi The _pthreads_ library dropped support for PHP 7.1. Due to memory leaks in PHP 7.0 and 7.1 they started requiring PHP 7.2. The `shimmi/7.1-zts` image since version [v1.2.1](https://github.com/Shimmi/docker-php/tree/v1.2.1) has locked _pthreads_ to the last commit suitable for PHP 7.1. You are "required" to -upgrade to PHP 7.2. You may try the `shimmi/7.2-rc-zts`, but please note it is a release candidate -and it shall not be used on production servers. +upgrade to PHP 7.2. Please use the `shimmi/7.2-zts`.