REL-0.12 Making devilbox ready for PHP 7.2

2024-12-18 20:37:55 +00:00 · 2017-06-27 13:14:02 +02:00 · 2017-06-27 13:14:02 +02:00 · 4ea1aa2370
commit 4ea1aa2370
parent ba498cad2a
10 changed files with 178 additions and 89 deletions
--- a/.devilbox/www/include/lib/container/Memcd.php
+++ b/.devilbox/www/include/lib/container/Memcd.php
@ -37,47 +37,47 @@ class Memcd extends BaseClass implements BaseInterface
 	{
 		parent::__construct($hostname, $data);

-		$memcd = new \Memcached('_devilbox');
-		$list = $memcd->getServerList();
+		if (class_exists('Memcached')) {
+			$memcd = new \Memcached('_devilbox');
+			$list = $memcd->getServerList();

-//		if (!empty($list)) {
-//			$memcd->resetServerList();
-//		}
-		if (empty($list)) {
-			//$memcd->setOption(\Memcached::OPT_RECV_TIMEOUT, 100);
-			//$memcd->setOption(\Memcached::OPT_SEND_TIMEOUT, 100);
-			$memcd->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
-			$memcd->setOption(\Memcached::OPT_BINARY_PROTOCOL, false);
-			//$memcd->setOption(\Memcached::OPT_SERVER_FAILURE_LIMIT, 50);
-			//$memcd->setOption(\Memcached::OPT_CONNECT_TIMEOUT, 100);
-			//$memcd->setOption(\Memcached::OPT_RETRY_TIMEOUT, 100);
-			//$memcd->setOption(\Memcached::OPT_REMOVE_FAILED_SERVERS, true);
-			$memcd->addServer($hostname, 11211);
-		}
+			if (empty($list)) {
+				$memcd->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
+				$memcd->setOption(\Memcached::OPT_BINARY_PROTOCOL, false);
+				$memcd->addServer($hostname, 11211);
+			}

-		$err = false;
-		$stats = $memcd->getStats();
-		if (!isset($stats[$hostname.':11211'])) {
-			$memcd->quit();
-			$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (no connection array)';
-			$this->_connect_errno = 1;
-			return;
-		}
-		else if (!isset($stats[$hostname.':11211']['pid'])) {
-			$memcd->quit();
-			$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (no pid)';
-			$this->_connect_errno = 2;
-			return;
-		}
-		else if ($stats[$hostname.':11211']['pid'] < 1) {
-			$memcd->quit();
-			$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (invalid pid)';
-			$this->_connect_errno = 3;
-			return;
-		}
+			$err = false;
+			$stats = $memcd->getStats();
+			if (!isset($stats[$hostname.':11211'])) {
+				$memcd->quit();
+				$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (no connection array)';
+				$this->_connect_errno = 1;
+				return;
+			}
+			else if (!isset($stats[$hostname.':11211']['pid'])) {
+				$memcd->quit();
+				$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (no pid)';
+				$this->_connect_errno = 2;
+				return;
+			}
+			else if ($stats[$hostname.':11211']['pid'] < 1) {
+				$memcd->quit();
+				$this->_connect_error = 'Failed to connect to Memcached host on '.$hostname.' (invalid pid)';
+				$this->_connect_errno = 3;
+				return;
+			}

-		$memcd->set('devilbox-version', $GLOBALS['DEVILBOX_VERSION'].' ('.$GLOBALS['DEVILBOX_DATE'].')');
-		$this->_memcached = $memcd;
+			$memcd->set('devilbox-version', $GLOBALS['DEVILBOX_VERSION'].' ('.$GLOBALS['DEVILBOX_DATE'].')');
+			$this->_memcached = $memcd;
+		} else {
+
+			$ret = 0;
+			loadClass('Helper')->exec('echo "stats" | nc 127.0.0.1 11211', $ret);
+			if ($ret == 0) {
+				$this->_memcached = true;
+			}
+		}
 	}

 	/**
@ -85,8 +85,10 @@ class Memcd extends BaseClass implements BaseInterface
 	 */
 	public function __destruct()
 	{
-		if ($this->_memcached) {
-			$this->_memcached->quit();
+		if (class_exists('Memcached')) {
+			if ($this->_memcached) {
+				$this->_memcached->quit();
+			}
 		}
 	}

@ -102,12 +104,14 @@ class Memcd extends BaseClass implements BaseInterface
 	public function getKeys()
 	{
 		$store = array();
-		if ($this->_memcached) {
-			if (!($keys = $this->_memcached->getAllKeys())) {
-				$keys = array();
+		if (class_exists('Memcached')) {
+			if ($this->_memcached) {
+				if (!($keys = $this->_memcached->getAllKeys())) {
+					$keys = array();
+				}
+				$this->_memcached->getDelayed($keys);
+				$store = $this->_memcached->fetchAll();
 			}
-			$this->_memcached->getDelayed($keys);
-			$store = $this->_memcached->fetchAll();
 		}
 		return $store;
 	}
@ -115,11 +119,24 @@ class Memcd extends BaseClass implements BaseInterface
 	public function getInfo()
 	{
 		$stats = array();
-		if ($this->_memcached) {
-			$stats = $this->_memcached->getStats();
+		if (class_exists('Memcached')) {
+			if ($this->_memcached) {
+				$stats = $this->_memcached->getStats();
+			}
+		} else {
+			$ret = 0;
+			$output = loadClass('Helper')->exec('echo "stats" | nc 127.0.0.1 11211 | sed "s/^STAT[[:space:]]*//g" | grep -v "END"', $ret);
+			if ($ret == 0) {
+				$output = explode("\n", $output);
+				foreach ($output as $line) {
+					$tmp = explode(' ', $line);
+					$key = isset($tmp[0]) ? $tmp[0] : '';
+					$val = isset($tmp[1]) ? $tmp[1] : '';
+					$stats['127.0.0.1'][$key] = $val;
+				}
+			}
 		}
 		return $stats;
-
 	}


@ -147,40 +164,53 @@ class Memcd extends BaseClass implements BaseInterface
 			return $this->_can_connect[$hostname];
 		}

-		// Silence errors and try to connect
-		//error_reporting(-1);
-		$memcd = new \Memcached();
-		$memcd->resetServerList();
+		if (class_exists('Memcached')) {
+			// Silence errors and try to connect
+			//error_reporting(-1);
+			$memcd = new \Memcached();
+			$memcd->resetServerList();


-		if (!$memcd->addServer($hostname, 11211)) {
+			if (!$memcd->addServer($hostname, 11211)) {
+				$memcd->quit();
+				$err = 'Failed to connect to Memcached host on '.$hostname;
+				$this->_can_connect[$hostname] = false;
+				$this->_can_connect_err[$hostname] = $err;
+				return false;
+			}
+
+			$stats = $memcd->getStats();
+			if (!isset($stats[$hostname.':11211'])) {
+				$err = 'Failed to connect to Memcached host on '.$hostname;
+				$this->_can_connect[$hostname] = false;
+			}
+			else if (!isset($stats[$hostname.':11211']['pid'])) {
+				$err = 'Failed to connect to Memcached host on '.$hostname;
+				$this->_can_connect[$hostname] = false;
+			}
+			else if ($stats[$hostname.':11211']['pid'] < 1) {
+				$err = 'Failed to connect to Memcached host on '.$hostname;
+				$this->_can_connect[$hostname] = false;
+			}
+			else {
+				$this->_can_connect[$hostname] = true;
+			}
+
 			$memcd->quit();
-			$err = 'Failed to connect to Memcached host on '.$hostname;
-			$this->_can_connect[$hostname] = false;
+
 			$this->_can_connect_err[$hostname] = $err;
-			return false;
+		} else {
+
+			$ret = 0;
+			loadClass('Helper')->exec('echo "stats" | nc '.$hostname.' 11211', $ret);
+			if ($ret == 0) {
+				$this->_can_connect[$hostname] = true;
+			} else {
+				$err = 'Failed to connect to Memcached host on '.$hostname;
+				$this->_can_connect[$hostname] = false;
+			}
 		}

-		$stats = $memcd->getStats();
-		if (!isset($stats[$hostname.':11211'])) {
-			$err = 'Failed to connect to Memcached host on '.$hostname;
-			$this->_can_connect[$hostname] = false;
-		}
-		else if (!isset($stats[$hostname.':11211']['pid'])) {
-			$err = 'Failed to connect to Memcached host on '.$hostname;
-			$this->_can_connect[$hostname] = false;
-		}
-		else if ($stats[$hostname.':11211']['pid'] < 1) {
-			$err = 'Failed to connect to Memcached host on '.$hostname;
-			$this->_can_connect[$hostname] = false;
-		}
-		else {
-			$this->_can_connect[$hostname] = true;
-		}
-
-		$memcd->quit();
-
-		$this->_can_connect_err[$hostname] = $err;
 		return $this->_can_connect[$hostname];
 	}

@ -203,15 +233,21 @@ class Memcd extends BaseClass implements BaseInterface
 			return $this->_version;
 		}

-		if ($this->_memcached) {
-			$info = $this->_memcached->getVersion();
-			$info = array_values($info);
-			if (!isset($info[0])) {
-				loadClass('Logger')->error('Could not get Memcached version');
-				$this->_version = '';
-			} else {
-				$this->_version = $info[0];
+		if (class_exists('Memcached')) {
+
+			if ($this->_memcached) {
+				$info = $this->_memcached->getVersion();
+				$info = array_values($info);
+				if (!isset($info[0])) {
+					loadClass('Logger')->error('Could not get Memcached version');
+					$this->_version = '';
+				} else {
+					$this->_version = $info[0];
+				}
 			}
+		} else {
+			$version = loadClass('Helper')->exec('echo "version" | nc 127.0.0.1 11211 | grep -oE "[0-9.-]+"', $ret);
+			$this->_version = $version;
 		}
 		return $this->_version;
 	}
--- a/.gitignore
+++ b/.gitignore
@ -38,6 +38,7 @@
 /cfg/php-fpm-5.6/*.ini
 /cfg/php-fpm-7.0/*.ini
 /cfg/php-fpm-7.1/*.ini
+/cfg/php-fpm-7.2/*.ini
 /cfg/hhvm-latest/*.ini


--- a/.travis.yml
+++ b/.travis.yml
@ -29,6 +29,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=HTTPD V2=apache-2.2
  - S1=PHP V1=php-fpm-7.0 S2=HTTPD V2=apache-2.2
  - S1=PHP V1=php-fpm-7.1 S2=HTTPD V2=apache-2.2
+  - S1=PHP V1=php-fpm-7.2 S2=HTTPD V2=apache-2.2
  - S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.2
  # PHP vs Apache 2.4
  - S1=PHP V1=php-fpm-5.4 S2=HTTPD V2=apache-2.4
@ -36,6 +37,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=HTTPD V2=apache-2.4
  - S1=PHP V1=php-fpm-7.0 S2=HTTPD V2=apache-2.4
  - S1=PHP V1=php-fpm-7.1 S2=HTTPD V2=apache-2.4
+  - S1=PHP V1=php-fpm-7.2 S2=HTTPD V2=apache-2.4
  - S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.4
  # PHP vs Nginx stable
  - S1=PHP V1=php-fpm-5.4 S2=HTTPD V2=nginx-stable
@ -43,6 +45,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=HTTPD V2=nginx-stable
  - S1=PHP V1=php-fpm-7.0 S2=HTTPD V2=nginx-stable
  - S1=PHP V1=php-fpm-7.1 S2=HTTPD V2=nginx-stable
+  - S1=PHP V1=php-fpm-7.2 S2=HTTPD V2=nginx-stable
  - S1=PHP V1=hhvm-latest S2=HTTPD V2=nginx-stable
  # PHP vs Nginx mainline
  - S1=PHP V1=php-fpm-5.4 S2=HTTPD V2=nginx-mainline
@ -50,6 +53,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=HTTPD V2=nginx-mainline
  - S1=PHP V1=php-fpm-7.0 S2=HTTPD V2=nginx-mainline
  - S1=PHP V1=php-fpm-7.1 S2=HTTPD V2=nginx-mainline
+  - S1=PHP V1=php-fpm-7.2 S2=HTTPD V2=nginx-mainline
  - S1=PHP V1=hhvm-latest S2=HTTPD V2=nginx-mainline

  ###
@ -61,6 +65,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mysql-5.5
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mysql-5.5
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mysql-5.5
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mysql-5.5
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mysql-5.5
  # PHP vs MySQL 5.6
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mysql-5.6
@ -68,6 +73,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mysql-5.6
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mysql-5.6
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mysql-5.6
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mysql-5.6
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mysql-5.6
  # PHP vs MySQL 5.7
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mysql-5.7
@ -75,6 +81,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mysql-5.7
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mysql-5.7
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mysql-5.7
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mysql-5.7
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mysql-5.7
  # PHP vs MySQL 8.0
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mysql-8.0
@ -82,6 +89,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mysql-8.0
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mysql-8.0
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mysql-8.0
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mysql-8.0
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mysql-8.0
  # PHP vs MariaDB 5.5
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mariadb-5.5
@ -89,6 +97,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mariadb-5.5
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mariadb-5.5
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mariadb-5.5
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mariadb-5.5
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-5.5
  # PHP vs MariaDB 10.0
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mariadb-10.0
@ -96,6 +105,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mariadb-10.0
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mariadb-10.0
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mariadb-10.0
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mariadb-10.0
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-10.0
  # PHP vs MariaDB 10.1
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mariadb-10.1
@ -103,6 +113,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mariadb-10.1
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mariadb-10.1
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mariadb-10.1
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mariadb-10.1
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-10.1
  # PHP vs MariaDB 10.2
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mariadb-10.2
@ -110,6 +121,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mariadb-10.2
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mariadb-10.2
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mariadb-10.2
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mariadb-10.2
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-10.2
  # PHP vs MariaDB 10.3
  - S1=PHP V1=php-fpm-5.4 S2=MYSQL V2=mariadb-10.3
@ -117,6 +129,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=MYSQL V2=mariadb-10.3
  - S1=PHP V1=php-fpm-7.0 S2=MYSQL V2=mariadb-10.3
  - S1=PHP V1=php-fpm-7.1 S2=MYSQL V2=mariadb-10.3
+  - S1=PHP V1=php-fpm-7.2 S2=MYSQL V2=mariadb-10.3
  - S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-10.3

  ###
@ -128,6 +141,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=9.2
  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=9.2
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.2
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.2
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.2
  # PHP vs PgSQL 9.3
  - S1=PHP V1=php-fpm-5.4 S2=PGSQL V2=9.3
@ -135,6 +149,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=9.3
  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=9.3
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.3
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.3
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.3
  # PHP vs PgSQL 9.4
  - S1=PHP V1=php-fpm-5.4 S2=PGSQL V2=9.4
@ -142,6 +157,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=9.4
  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=9.4
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.4
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.4
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.4
  # PHP vs PgSQL 9.5
  - S1=PHP V1=php-fpm-5.4 S2=PGSQL V2=9.5
@ -149,6 +165,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=9.5
  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=9.5
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.5
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.5
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.5
  # PHP vs PgSQL 9.6
  - S1=PHP V1=php-fpm-5.4 S2=PGSQL V2=9.6
@ -156,6 +173,7 @@ env:
  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=9.6
  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=9.6
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.6
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.6
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.6


--- a/README.md
+++ b/README.md
@ -114,7 +114,7 @@ Every single attachable container comes with many different versions. In order t
      <td><a target="_blank" title="MariaDB 10.2"     href="https://github.com/cytopia/docker-mariadb-10.2">10.2</a></td>
      <td><a target="_blank" title="PgSQL 9.4"        href="https://github.com/docker-library/postgres">9.4</a></td>
      <td></td>
-      <td>...</td>
+      <td><a target="_blank" title="Memcached 1.4.23" href="https://github.com/docker-library/memcached">1.4.24</a></td>
      <td><a target="_blank" title="MongoDB 3.4"      href="https://github.com/docker-library/mongo">3.4</a></td>
    </tr>
    <tr>
@ -125,16 +125,27 @@ Every single attachable container comes with many different versions. In order t
      <td><a target="_blank" title="MariaDB 10.3"     href="https://github.com/cytopia/docker-mariadb-10.3">10.3</a></td>
      <td><a target="_blank" title="PgSQL 9.5"        href="https://github.com/docker-library/postgres">9.5</a></td>
      <td></td>
-      <td><a target="_blank" title="Memcached 1.4.36" href="https://github.com/docker-library/memcached">1.4.36</a></td>
+      <td>...</td>
      <td><a target="_blank" title="MongoDB 3.5"      href="https://github.com/docker-library/mongo">3.5</a></td>
    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td><a target="_blank" title="PHP 7.2"          href="https://github.com/cytopia/docker-php-fpm-7.2">7.2</a></td>
+      <td></td>
+      <td></td>
+      <td><a target="_blank" title="PgSQL 9.6"        href="https://github.com/docker-library/postgres">9.6</a></td>
+      <td></td>
+      <td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">1.4.36</a></td>
+      <td></td>
+    </tr>
    <tr>
      <td></td>
      <td></td>
      <td><a target="_blank" title="HHVM"             href="https://github.com/cytopia/docker-hhvm-latest">HHVM</a></td>
      <td></td>
      <td></td>
-      <td><a target="_blank" title="PgSQL 9.6"        href="https://github.com/docker-library/postgres">9.6</a></td>
+      <td></td>
      <td></td>
      <td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
      <td></td>
@ -339,6 +350,7 @@ In order to make sure every combination works with each other, the devilbox inte
 |     | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-stable) [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
 |     | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [Nginx mainline](https://github.com/cytopia/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 |     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
+|     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.2) [PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2)
 |     | | [![Build Status](https://travis-ci.org/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest)

 #### SQL stack (optional)
--- a/cfg/php-fpm-7.2/.keepme
+++ b/cfg/php-fpm-7.2/.keepme
--- a/cfg/php-fpm-7.2/devilbox-custom.ini-example
+++ b/cfg/php-fpm-7.2/devilbox-custom.ini-example
@ -0,0 +1,18 @@
+[PHP]
+; Memory
+memory_limit			= 4096M
+
+; Timeouts
+max_execution_time		= 180
+max_input_time			= 180
+; Uploads
+post_max_size			= 1990M
+upload_max_filesize		= 1990M
+
+; Vars
+max_input_vars			= 8000
+
+; Error reporting
+error_reporting			= E_ALL
+display_errors			= On
+track_errors			= On
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@ -64,6 +64,7 @@ There will however be slight differences between the versions and especially wit
 [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
 [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
+[PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2) |
 [HHVM](https://github.com/cytopia/docker-hhvm-latest)

 **Can I add other PHP Modules?**
--- a/docs/README.md
+++ b/docs/README.md
@ -168,6 +168,7 @@ There will however be slight differences between the versions and especially wit
 [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
 [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
+[PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2) |
 [HHVM](https://github.com/cytopia/docker-hhvm-latest)


--- a/docs/Usage.md
+++ b/docs/Usage.md
@ -145,6 +145,7 @@ The complete list of tools including their version can be found at the PHP docke
 [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
 [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
+[PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2) |
 [HHVM](https://github.com/cytopia/docker-hhvm-latest)

 If you permanently require additional software refer to [Hacking](Hacking.md).
--- a/5
+++ b/5
@ -116,8 +116,9 @@ TIMEZONE=Europe/Berlin
 #PHP_SERVER=php-fpm-5.4
 #PHP_SERVER=php-fpm-5.5
 #PHP_SERVER=php-fpm-5.6
-PHP_SERVER=php-fpm-7.0
-#PHP_SERVER=php-fpm-7.1
+#PHP_SERVER=php-fpm-7.0
+PHP_SERVER=php-fpm-7.1
+#PHP_SERVER=php-fpm-7.2
 #PHP_SERVER=hhvm-latest