diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 1804aaee..0c9f6850 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -13,8 +13,8 @@ error_reporting(-1); putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); -$DEVILBOX_VERSION = 'v0.14'; -$DEVILBOX_DATE = '2018-05-05'; +$DEVILBOX_VERSION = 'v0.15'; +$DEVILBOX_DATE = '2018-05-12'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/.devilbox/www/include/lib/Helper.php b/.devilbox/www/include/lib/Helper.php index 4c3526be..d1750554 100644 --- a/.devilbox/www/include/lib/Helper.php +++ b/.devilbox/www/include/lib/Helper.php @@ -92,7 +92,7 @@ class Helper $output = array(); // Translate PHP Docker environmental variables to $ENV - exec('env', $output); + exec('/usr/bin/env', $output); foreach ($output as $var) { $tmp = explode('=', $var); diff --git a/.devilbox/www/include/lib/Mail.php b/.devilbox/www/include/lib/Mail.php index bab4634c..8a1353b7 100644 --- a/.devilbox/www/include/lib/Mail.php +++ b/.devilbox/www/include/lib/Mail.php @@ -85,27 +85,33 @@ class Mail } // Optionally sort messages - if (is_array($sort) && (array_values($sort)[0] == 'ASC' || array_values($sort)[0] == 'DESC')) { - $key = array_keys($sort)[0]; - $order = array_values($sort)[0]; + if (is_array($sort)) { + $array_values = array_values($sort); + $array_value = $array_values[0]; + if ($array_value == 'ASC' || $array_value == 'DESC') { + $key = array_keys($sort); + $key = $key[0]; + $order = array_values($sort); + $order = $order[0]; - $sorter = function ($a, $b) use ($key, $order) { - $val1 = $a['decoded']->headers[$key]; - $val2 = $b['decoded']->headers[$key]; + $sorter = function ($a, $b) use ($key, $order) { + $val1 = $a['decoded']->headers[$key]; + $val2 = $b['decoded']->headers[$key]; - // Convert date strings to timestamps for comparison - if (strtotime($val1) !== false && strtotime($val2) !== false) { - $val1 = strtotime($val1); - $val2 = strtotime($val2); - } + // Convert date strings to timestamps for comparison + if (strtotime($val1) !== false && strtotime($val2) !== false) { + $val1 = strtotime($val1); + $val2 = strtotime($val2); + } - if ($order === 'ASC') { - return (strcmp($val1, $val2) > 0); - } else { - return (strcmp($val1, $val2) <= 0); - } - }; - usort($messages, $sorter); + if ($order === 'ASC') { + return (strcmp($val1, $val2) > 0); + } else { + return (strcmp($val1, $val2) <= 0); + } + }; + usort($messages, $sorter); + } } return $messages; diff --git a/.devilbox/www/include/lib/container/Mongo.php b/.devilbox/www/include/lib/container/Mongo.php index d7d9ca92..a78b241d 100644 --- a/.devilbox/www/include/lib/container/Mongo.php +++ b/.devilbox/www/include/lib/container/Mongo.php @@ -115,12 +115,22 @@ class Mongo extends BaseClass implements BaseInterface $databases = array(); $tmp = $this->command(array('listDatabases' => true)); if (isset($tmp[0])) { - foreach ($tmp[0]->databases as $db) { - $databases[] = array( - 'name' => $db->name, - 'size' => $db->sizeOnDisk, - 'empty' => $db->empty - ); + if (is_array($tmp[0])) { + foreach ($tmp[0]['databases'] as $db) { + $databases[] = array( + 'name' => $db->name, + 'size' => $db->sizeOnDisk, + 'empty' => $db->empty + ); + } + } else { + foreach ($tmp[0]->databases as $db) { + $databases[] = array( + 'name' => $db->name, + 'size' => $db->sizeOnDisk, + 'empty' => $db->empty + ); + } } } diff --git a/.devilbox/www/include/lib/container/Mysql.php b/.devilbox/www/include/lib/container/Mysql.php index 677485df..031c8050 100644 --- a/.devilbox/www/include/lib/container/Mysql.php +++ b/.devilbox/www/include/lib/container/Mysql.php @@ -207,7 +207,8 @@ class Mysql extends BaseClass implements BaseInterface $val = $this->select($sql, $callback); if (is_array($val) && $val) { - return array_values($val)[0]; + $array_values = array_values($val); + return $array_values[0]; } else { return $val; } diff --git a/.travis.yml b/.travis.yml index fe2df271..91386b5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,190 +24,63 @@ env: ### PHP vs WWW ### # PHP vs Apache 2.2 + - S1=PHP V1=5.3 S2=HTTPD V2=apache-2.2 - S1=PHP V1=5.4 S2=HTTPD V2=apache-2.2 - S1=PHP V1=5.5 S2=HTTPD V2=apache-2.2 - S1=PHP V1=5.6 S2=HTTPD V2=apache-2.2 - S1=PHP V1=7.0 S2=HTTPD V2=apache-2.2 - S1=PHP V1=7.1 S2=HTTPD V2=apache-2.2 - S1=PHP V1=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=5.3 S2=HTTPD V2=apache-2.4 - S1=PHP V1=5.4 S2=HTTPD V2=apache-2.4 - S1=PHP V1=5.5 S2=HTTPD V2=apache-2.4 - S1=PHP V1=5.6 S2=HTTPD V2=apache-2.4 - S1=PHP V1=7.0 S2=HTTPD V2=apache-2.4 - S1=PHP V1=7.1 S2=HTTPD V2=apache-2.4 - S1=PHP V1=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=5.3 S2=HTTPD V2=nginx-stable - S1=PHP V1=5.4 S2=HTTPD V2=nginx-stable - S1=PHP V1=5.5 S2=HTTPD V2=nginx-stable - S1=PHP V1=5.6 S2=HTTPD V2=nginx-stable - S1=PHP V1=7.0 S2=HTTPD V2=nginx-stable - S1=PHP V1=7.1 S2=HTTPD V2=nginx-stable - S1=PHP V1=7.2 S2=HTTPD V2=nginx-stable - #- S1=PHP V1=hhvm-latest S2=HTTPD V2=nginx-stable # PHP vs Nginx mainline + - S1=PHP V1=5.3 S2=HTTPD V2=nginx-mainline - S1=PHP V1=5.4 S2=HTTPD V2=nginx-mainline - S1=PHP V1=5.5 S2=HTTPD V2=nginx-mainline - S1=PHP V1=5.6 S2=HTTPD V2=nginx-mainline - S1=PHP V1=7.0 S2=HTTPD V2=nginx-mainline - S1=PHP V1=7.1 S2=HTTPD V2=nginx-mainline - S1=PHP V1=7.2 S2=HTTPD V2=nginx-mainline - #- S1=PHP V1=hhvm-latest S2=HTTPD V2=nginx-mainline ### - ### PHP vs MYSQL + ### MYSQL ### - # PHP vs MySQL 5.5 - - S1=PHP V1=5.4 S2=MYSQL V2=mysql-5.5 - - S1=PHP V1=5.5 S2=MYSQL V2=mysql-5.5 - - S1=PHP V1=5.6 S2=MYSQL V2=mysql-5.5 - - S1=PHP V1=7.0 S2=MYSQL V2=mysql-5.5 - - S1=PHP V1=7.1 S2=MYSQL V2=mysql-5.5 - S1=PHP V1=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=5.4 S2=MYSQL V2=mysql-5.6 - - S1=PHP V1=5.5 S2=MYSQL V2=mysql-5.6 - - S1=PHP V1=5.6 S2=MYSQL V2=mysql-5.6 - - S1=PHP V1=7.0 S2=MYSQL V2=mysql-5.6 - - S1=PHP V1=7.1 S2=MYSQL V2=mysql-5.6 - S1=PHP V1=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=5.4 S2=MYSQL V2=mysql-5.7 - - S1=PHP V1=5.5 S2=MYSQL V2=mysql-5.7 - - S1=PHP V1=5.6 S2=MYSQL V2=mysql-5.7 - - S1=PHP V1=7.0 S2=MYSQL V2=mysql-5.7 - - S1=PHP V1=7.1 S2=MYSQL V2=mysql-5.7 - S1=PHP V1=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=5.4 S2=MYSQL V2=mysql-8.0 - - S1=PHP V1=5.5 S2=MYSQL V2=mysql-8.0 - - S1=PHP V1=5.6 S2=MYSQL V2=mysql-8.0 - - S1=PHP V1=7.0 S2=MYSQL V2=mysql-8.0 - - S1=PHP V1=7.1 S2=MYSQL V2=mysql-8.0 - S1=PHP V1=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=5.4 S2=MYSQL V2=mariadb-5.5 - - S1=PHP V1=5.5 S2=MYSQL V2=mariadb-5.5 - - S1=PHP V1=5.6 S2=MYSQL V2=mariadb-5.5 - - S1=PHP V1=7.0 S2=MYSQL V2=mariadb-5.5 - - S1=PHP V1=7.1 S2=MYSQL V2=mariadb-5.5 - S1=PHP V1=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=5.4 S2=MYSQL V2=mariadb-10.0 - - S1=PHP V1=5.5 S2=MYSQL V2=mariadb-10.0 - - S1=PHP V1=5.6 S2=MYSQL V2=mariadb-10.0 - - S1=PHP V1=7.0 S2=MYSQL V2=mariadb-10.0 - - S1=PHP V1=7.1 S2=MYSQL V2=mariadb-10.0 - S1=PHP V1=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=5.4 S2=MYSQL V2=mariadb-10.1 - - S1=PHP V1=5.5 S2=MYSQL V2=mariadb-10.1 - - S1=PHP V1=5.6 S2=MYSQL V2=mariadb-10.1 - - S1=PHP V1=7.0 S2=MYSQL V2=mariadb-10.1 - - S1=PHP V1=7.1 S2=MYSQL V2=mariadb-10.1 - S1=PHP V1=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=5.4 S2=MYSQL V2=mariadb-10.2 - - S1=PHP V1=5.5 S2=MYSQL V2=mariadb-10.2 - - S1=PHP V1=5.6 S2=MYSQL V2=mariadb-10.2 - - S1=PHP V1=7.0 S2=MYSQL V2=mariadb-10.2 - - S1=PHP V1=7.1 S2=MYSQL V2=mariadb-10.2 - S1=PHP V1=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=5.4 S2=MYSQL V2=mariadb-10.3 - - S1=PHP V1=5.5 S2=MYSQL V2=mariadb-10.3 - - S1=PHP V1=5.6 S2=MYSQL V2=mariadb-10.3 - - S1=PHP V1=7.0 S2=MYSQL V2=mariadb-10.3 - - S1=PHP V1=7.1 S2=MYSQL V2=mariadb-10.3 - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.3 - #- S1=PHP V1=hhvm-latest S2=MYSQL V2=mariadb-10.3 - # PHP vs PerconaDB 5.5 - - S1=PHP V1=5.4 S2=MYSQL V2=percona-5.5 - - S1=PHP V1=5.5 S2=MYSQL V2=percona-5.5 - - S1=PHP V1=5.6 S2=MYSQL V2=percona-5.5 - - S1=PHP V1=7.0 S2=MYSQL V2=percona-5.5 - - S1=PHP V1=7.1 S2=MYSQL V2=percona-5.5 - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.5 - #- S1=PHP V1=hhvm-latest S2=MYSQL V2=percona-5.5 - # PHP vs PerconaDB 5.6 - - S1=PHP V1=5.4 S2=MYSQL V2=percona-5.6 - - S1=PHP V1=5.5 S2=MYSQL V2=percona-5.6 - - S1=PHP V1=5.6 S2=MYSQL V2=percona-5.6 - - S1=PHP V1=7.0 S2=MYSQL V2=percona-5.6 - - S1=PHP V1=7.1 S2=MYSQL V2=percona-5.6 - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.6 - #- S1=PHP V1=hhvm-latest S2=MYSQL V2=percona-5.6 - # PHP vs PerconaDB 5.7 - - S1=PHP V1=5.4 S2=MYSQL V2=percona-5.7 - - S1=PHP V1=5.5 S2=MYSQL V2=percona-5.7 - - S1=PHP V1=5.6 S2=MYSQL V2=percona-5.7 - - S1=PHP V1=7.0 S2=MYSQL V2=percona-5.7 - - S1=PHP V1=7.1 S2=MYSQL V2=percona-5.7 - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.7 - #- S1=PHP V1=hhvm-latest S2=MYSQL V2=percona-5.7 - ### - ### PHP vs PostgreSQL + ### PostgreSQL ### - # PHP vs PgSQL 9.2 - - S1=PHP V1=5.4 S2=PGSQL V2=9.2 - - S1=PHP V1=5.5 S2=PGSQL V2=9.2 - - S1=PHP V1=5.6 S2=PGSQL V2=9.2 - - S1=PHP V1=7.0 S2=PGSQL V2=9.2 - - S1=PHP V1=7.1 S2=PGSQL V2=9.2 - S1=PHP V1=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=5.4 S2=PGSQL V2=9.3 - - S1=PHP V1=5.5 S2=PGSQL V2=9.3 - - S1=PHP V1=5.6 S2=PGSQL V2=9.3 - - S1=PHP V1=7.0 S2=PGSQL V2=9.3 - - S1=PHP V1=7.1 S2=PGSQL V2=9.3 - S1=PHP V1=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=5.4 S2=PGSQL V2=9.4 - - S1=PHP V1=5.5 S2=PGSQL V2=9.4 - - S1=PHP V1=5.6 S2=PGSQL V2=9.4 - - S1=PHP V1=7.0 S2=PGSQL V2=9.4 - - S1=PHP V1=7.1 S2=PGSQL V2=9.4 - S1=PHP V1=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=5.4 S2=PGSQL V2=9.5 - - S1=PHP V1=5.5 S2=PGSQL V2=9.5 - - S1=PHP V1=5.6 S2=PGSQL V2=9.5 - - S1=PHP V1=7.0 S2=PGSQL V2=9.5 - - S1=PHP V1=7.1 S2=PGSQL V2=9.5 - S1=PHP V1=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=5.4 S2=PGSQL V2=9.6 - - S1=PHP V1=5.5 S2=PGSQL V2=9.6 - - S1=PHP V1=5.6 S2=PGSQL V2=9.6 - - S1=PHP V1=7.0 S2=PGSQL V2=9.6 - - S1=PHP V1=7.1 S2=PGSQL V2=9.6 - S1=PHP V1=7.2 S2=PGSQL V2=9.6 - #- S1=PHP V1=hhvm-latest S2=PGSQL V2=9.6 - # PHP vs PgSQL 10.0 - - S1=PHP V1=5.4 S2=PGSQL V2=10.0 - - S1=PHP V1=5.5 S2=PGSQL V2=10.0 - - S1=PHP V1=5.6 S2=PGSQL V2=10.0 - - S1=PHP V1=7.0 S2=PGSQL V2=10.0 - - S1=PHP V1=7.1 S2=PGSQL V2=10.0 - S1=PHP V1=7.2 S2=PGSQL V2=10.0 - #- S1=PHP V1=hhvm-latest S2=PGSQL V2=10.0 ### diff --git a/README.md b/README.md index c8f7979b..16ed4dc4 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Every single attachable container comes with many different versions. In order t 2.2 stable - 5.4 + 5.3 5.5 5.5 5.5 @@ -134,7 +134,7 @@ Every single attachable container comes with many different versions. In order t 2.4 mainline - 5.5 + 5.4 5.6 10.0 5.6 @@ -146,7 +146,7 @@ Every single attachable container comes with many different versions. In order t - 5.6 + 5.5 5.7 10.1 5.7 @@ -158,7 +158,7 @@ Every single attachable container comes with many different versions. In order t - 7.0 + 5.6 8.0 10.2 @@ -170,7 +170,7 @@ Every single attachable container comes with many different versions. In order t - 7.1 + 7.0 10.3 @@ -182,7 +182,7 @@ Every single attachable container comes with many different versions. In order t - 7.2 + 7.1 @@ -194,7 +194,7 @@ Every single attachable container comes with many different versions. In order t - + 7.2 diff --git a/cfg/php-fpm-5.3/.keepme b/cfg/php-fpm-5.3/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/cfg/php-ini-5.3/.keepme b/cfg/php-ini-5.3/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/cfg/php-ini-5.3/devilbox-custom.ini-example b/cfg/php-ini-5.3/devilbox-custom.ini-example new file mode 100644 index 00000000..0d74166d --- /dev/null +++ b/cfg/php-ini-5.3/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 diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst index 499df0a9..c4019bd2 100644 --- a/docs/configuration-files/env-file.rst +++ b/docs/configuration-files/env-file.rst @@ -524,11 +524,11 @@ PHP_SERVER This variable choses your desired PHP-FPM version to be started. -+-------------------------+--------------------------------------------------------------------------------------------------------------------------+-----------------+ -| Name | Allowed values | Default value | -+=========================+==========================================================================================================================+=================+ -| ``PHP_SERVER`` | ``php-fpm-5.4`` |br| ``php-fpm-5.5`` |br| ``php-fpm-5.6`` |br| ``php-fpm-7.0`` |br| ``php-fpm-7.1`` |br| ``php-fpm-7.2`` | ``php-fpm-7.1`` | -+-------------------------+--------------------------------------------------------------------------------------------------------------------------+-----------------+ ++-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ +| Name | Allowed values | Default value | ++=========================+===============================================================================================================================================+=================+ +| ``PHP_SERVER`` | ``php-fpm-5.3`` |br| ``php-fpm-5.4`` |br| ``php-fpm-5.5`` |br| ``php-fpm-5.6`` |br| ``php-fpm-7.0`` |br| ``php-fpm-7.1`` |br| ``php-fpm-7.2`` | ``php-fpm-7.1`` | ++-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ All values are already available in the ``.env`` file and just need to be commented or uncommented. If multiple values are uncommented, the last uncommented variable one takes precedences: @@ -539,14 +539,13 @@ All values are already available in the ``.env`` file and just need to be commen host> grep PHP_SERVER .env + #PHP_SERVER=php-fpm-5.3 #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.2 - #PHP_SERVER=php-fpm-7.3 - #PHP_SERVER=hhvm-latest .. _env_httpd_server: diff --git a/docs/configuration-files/php-fpm-conf.rst b/docs/configuration-files/php-fpm-conf.rst index bbdf6f6f..3c07b226 100644 --- a/docs/configuration-files/php-fpm-conf.rst +++ b/docs/configuration-files/php-fpm-conf.rst @@ -31,6 +31,7 @@ See the directory structure for PHP-FPM configuration directories inside ``./cfg host> ls -l path/to/devilbox/cfg/ | grep 'php-fpm' + drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-fpm-5.3/ drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-fpm-5.4/ drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-fpm-5.5/ drwxr-xr-x 2 cytopia cytopia 4096 Apr 3 22:04 php-fpm-5.6/ diff --git a/docs/configuration-files/php-ini.rst b/docs/configuration-files/php-ini.rst index 68685c9a..b0296e18 100644 --- a/docs/configuration-files/php-ini.rst +++ b/docs/configuration-files/php-ini.rst @@ -24,6 +24,7 @@ See the directory structure for PHP configuration directories inside ``./cfg/`` host> ls -l path/to/devilbox/cfg/ | grep 'php-ini' + drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-ini-5.3/ drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-ini-5.4/ drwxr-xr-x 2 cytopia cytopia 4096 Mar 5 21:53 php-ini-5.5/ drwxr-xr-x 2 cytopia cytopia 4096 Apr 3 22:04 php-ini-5.6/ diff --git a/docs/tutorials/change-container-versions.rst b/docs/tutorials/change-container-versions.rst index 91b8755e..823d6454 100644 --- a/docs/tutorials/change-container-versions.rst +++ b/docs/tutorials/change-container-versions.rst @@ -40,12 +40,13 @@ It will look something like this: :caption: .env :emphasize-lines: 5 + #PHP_SERVER=5.3 #PHP_SERVER=5.4 #PHP_SERVER=5.5 #PHP_SERVER=5.6 #PHP_SERVER=7.0 PHP_SERVER=7.1 - #PHP_SERVER=7.1 + #PHP_SERVER=7.2 As you can see, all available values are already there, but commented. Only one is uncommented. In this example it is ``7.1``, which is the PHP version that will be started, once the Devilbox @@ -61,12 +62,13 @@ In order to enable PHP 5.5, you would change the ``.env`` file like this: :caption: .env :emphasize-lines: 2 + #PHP_SERVER=5.3 #PHP_SERVER=5.4 PHP_SERVER=5.5 #PHP_SERVER=5.6 #PHP_SERVER=7.0 #PHP_SERVER=7.1 - #PHP_SERVER=7.1 + #PHP_SERVER=7.2 Start the Devilbox @@ -97,12 +99,13 @@ Consider this ``.env`` file: :caption: .env :emphasize-lines: 2,4 + #PHP_SERVER=5.3 #PHP_SERVER=5.4 PHP_SERVER=5.5 #PHP_SERVER=5.6 PHP_SERVER=7.0 #PHP_SERVER=7.1 - #PHP_SERVER=7.1 + #PHP_SERVER=7.2 Both, PHP 5.4 and PHP 7.0 are uncommented, however, when you start the Devilbox, it will use PHP 7.0 as this value overwrites any previous ones. diff --git a/env-example b/env-example index 077cb0e3..659bb5f4 100644 --- a/env-example +++ b/env-example @@ -221,6 +221,7 @@ DEVILBOX_UI_ENABLE=1 ### ### 1.1 Choose PHP Server Image ### +#PHP_SERVER=5.3 #PHP_SERVER=5.4 #PHP_SERVER=5.5 #PHP_SERVER=5.6 diff --git a/update-docker.sh b/update-docker.sh index f9db871c..5977326e 100755 --- a/update-docker.sh +++ b/update-docker.sh @@ -22,11 +22,13 @@ docker pull cytopia/bind:${TAG} ### PHP ### TAG="$( grep '^[[:space:]]*image:.*\${PHP_SERVER' "${CWD}/docker-compose.yml" | sed 's/^.*://g' )" +docker pull devilbox/php-fpm:5.3-work docker pull devilbox/php-fpm:5.4-work docker pull devilbox/php-fpm:5.5-work docker pull devilbox/php-fpm:5.6-work docker pull devilbox/php-fpm:7.0-work docker pull devilbox/php-fpm:7.1-work +docker pull devilbox/php-fpm:7.2-work #docker pull cytopia/hhvm-latest:${TAG} ###