From ab7e3b7279f88e6f66a6ec03c9a1c0567510d132 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 5 Mar 2018 22:48:48 +0100 Subject: [PATCH] Integrate new PHP container --- .devilbox/www/config.php | 4 ++-- .devilbox/www/htdocs/index.php | 38 ++-------------------------------- docker-compose.yml | 7 ------- env-example | 29 +++++++------------------- 4 files changed, 12 insertions(+), 66 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 56af2187..18a9c6a8 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.12.1'; -$DEVILBOX_DATE = '2018-01-30'; +$DEVILBOX_VERSION = 'v0.13'; +$DEVILBOX_DATE = '2018-03-05'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/.devilbox/www/htdocs/index.php b/.devilbox/www/htdocs/index.php index 0b3c7ebd..079c0323 100644 --- a/.devilbox/www/htdocs/index.php +++ b/.devilbox/www/htdocs/index.php @@ -372,40 +372,6 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL); Postfix getEnv('ENABLE_MAIL') ? 'Enabled' : 'No Disabled';?> - - Xdebug - - getEnv('PHP_XDEBUG_ENABLE') == 0) ? '' : loadClass('Helper')->getEnv('PHP_XDEBUG_ENABLE'); ?> - getConfig('xdebug.remote_enable')): ?> - getConfig('xdebug.remote_enable') == 1 ? 'Yes' : 'No'; ?> - - not installed.env file setting differs from custom php .ini file
'; ?> - getConfig('xdebug.remote_enable'); ?> - - - - - Xdebug Remote - - getEnv('PHP_XDEBUG_REMOTE_HOST') == loadClass('Php')->getConfig('xdebug.remote_host')): ?> - getConfig('xdebug.remote_host'); ?> - - not installed.env file setting differs from custom php .ini file
'; ?> - getConfig('xdebug.remote_host'); ?> - - - - - Xdebug Port - - getEnv('PHP_XDEBUG_REMOTE_PORT') == loadClass('Php')->getConfig('xdebug.remote_port')): ?> - getConfig('xdebug.remote_port'); ?> - - not installed.env file setting differs from custom php .ini file
'; ?> - getConfig('xdebug.remote_port'); ?> - - - @@ -766,7 +732,7 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL); php - ./cfg/getEnv('PHP_SERVER'); ?> + ./cfg/php-fpm-getEnv('PHP_SERVER'); ?> /etc/php-custom.d @@ -841,7 +807,7 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL); php - ./log/getEnv('PHP_SERVER'); ?> + ./log/php-fpm-getEnv('PHP_SERVER'); ?> /var/log/php diff --git a/docker-compose.yml b/docker-compose.yml index cad0e6e4..7d97f14c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,13 +93,6 @@ services: ## - TIMEZONE - ## - ## PHP Xdebug - ## - - PHP_XDEBUG_ENABLE - - PHP_XDEBUG_REMOTE_PORT - - PHP_XDEBUG_REMOTE_HOST - ## ## Mail-catching ## diff --git a/env-example b/env-example index 6db9735a..5fe7c84d 100644 --- a/env-example +++ b/env-example @@ -168,13 +168,12 @@ DEVILBOX_UI_DISABLE=0 ### ### 1.1 Choose PHP Server Image ### -#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=5.4 +#PHP_SERVER=5.5 +#PHP_SERVER=5.6 +#PHP_SERVER=7.0 PHP_SERVER=7.1 -#PHP_SERVER=php-fpm-7.2 -#PHP_SERVER=hhvm-latest +#PHP_SERVER=7.2 ### @@ -350,21 +349,9 @@ HOST_PATH_MONGO_DATADIR=./data/mongo ### ################################################################################ -### -### Xdebug -### - -# Enable/Disable Xdebug -PHP_XDEBUG_ENABLE=1 - -# Your local port (your computer host [not the docker]) -# where your ide/editor is listening for xdebug connections. -PHP_XDEBUG_REMOTE_PORT=9000 - -# Your local IP address (your computer host [not the docker]) -# where your ide/editor is listening for xdebug connections. -PHP_XDEBUG_REMOTE_HOST=192.168.0.215 -## TODO: Check if it works by automatically sending it to the broadcast address +# None +# +# Configure everything about PHP in cfg/php-fpm-X.X/*.ini