Merge pull request #747 from cytopia/release/v1.8.1

Release v1.8.1

.devilbox/www/config.php

@@ -13,8 +13,8 @@
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v1.8.0';
-$DEVILBOX_DATE = '2020-11-08';
+$DEVILBOX_VERSION = 'v1.8.1';
+$DEVILBOX_DATE = '2020-11-12';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

.devilbox/www/htdocs/opcache.php

@@ -13,6 +13,7 @@
  * @license MIT, http://acollington.mit-license.org/
  */
 
+error_reporting(E_ALL & ~E_DEPRECATED & ~E_NOTICE);
 
 /*
  * User configuration

.devilbox/www/htdocs/vendor/phpmemcachedadmin-1.3.0/Config/Memcache.php

@@ -1,4 +1,5 @@
 <?php
+error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE);
 return array (
 	'stats_api' => 'Server',
 	'slabs_api' => 'Server',

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,20 +25,21 @@ assignees: ''
 ### Checklist
 <!-- ENSURE YOU HAVE DONE THE FOLLOWING -->
 * [ ] `.env` file is attached
-* [ ] `docker-compose.override.yml` is attached (if it exists)
-* [ ] Custom configs from `cfg/` dir are attached (if customized)
-* [ ] `docker-compose logs` and `log/` output is added
+* [ ] `./check-config.sh` output is added below
+* [ ] `docker-compose logs` output is added below
+* [ ] `docker-compose.override.yml` is attached (if exists)
+* [ ] Custom configs from `cfg/` dir are attached (if exist)
 * [ ] I've looked through the docs: https://devilbox.readthedocs.io/en/latest/
 * [ ] I've looked through existing issues: https://github.com/cytopia/devilbox/issues
 * [ ] I've read troubleshooting: https://devilbox.readthedocs.io/en/latest/support/troubleshooting.html
 
 
 ### OS / ENVIRONMENT
 <!-- COMPLETE ALL 6 BULLET POINTS BELOW: -->
-1. Host operating system and version: 
-2. (Windows) Native Docker or Docker Toolbox: 
-3. Docker version: 
-4. Docker Compose version: 
+1. Host operating system and version:
+2. (Windows only) Native Docker or Docker Toolbox:
+3. Docker version:
+4. Docker Compose version:
 5. (Linux) Is SELinux enabled?:
 6. What git commit hash are you on?:
 
@@ -68,18 +69,17 @@ assignees: ''
 $ docker-compose up...
 ```
 
-#### File and user permissions (Linux & MacOS)
-<!-- User and group information -->
-```
-$ id
-```
+#### Outputs
+<!-- 1/2 Add the output from ./check-config.sh -->
+```bash
+$ ./check-config.sh
 
-<!-- File permissions of the Devilbox directory -->
-```
-$ ls -la
+<<< REPLACE THIS LINE WITH OUTPUT FROM ABOVE COMMAND >>>
 ```
 
-<!-- File permissions of your projects -->
-```
-$ ls -la data/www
+<!-- 2/2 Add the output from docker-compose logs -->
+```bash
+$ docker-compose logs
+
+<<< REPLACE THIS LINE WITH OUTPUT FROM ABOVE COMMAND >>>
 ```

.github/workflows/lint.yml

@@ -48,3 +48,11 @@ jobs:
         run: |
           cd .tests/
           make lint-tests
+
+      - name: Check configuration
+        shell: bash
+        run: |
+          cp env-example .env
+          sed -i'' "s/^NEW_UID=.*/NEW_UID=$(id -u)/g" .env
+          sed -i'' "s/^NEW_GID=.*/NEW_GID=$(id -g)/g" .env
+          ./check-config.sh

.gitignore

@@ -3,7 +3,7 @@
 # to re-index the git index (if there are already
 # commited files)
 #
-# $ git rm -r --cached .
+# $ git rm -r -f --cached .
 # $ git add .
 # $ git commit -m ".gitignore index rebuild"
 #
@@ -16,7 +16,6 @@
 # Ignore variable data
 /.env
 /backups/*
-/log/[a-z0-9-]*
 
 # Ignore Data dirs
 /data/www/*
@@ -27,6 +26,28 @@
 # Ignore compose override file
 /docker-compose.override.yml
 
+# Ignore logs
+/log/apache-2.2/*
+/log/apache-2.4/*
+/log/mariadb-10.3/*
+/log/nginx-mainline/*
+/log/nginx-stable/*
+/log/php-fpm-5.2/*
+/log/php-fpm-5.3/*
+/log/php-fpm-5.4/*
+/log/php-fpm-5.5/*
+/log/php-fpm-5.6/*
+/log/php-fpm-7.0/*
+/log/php-fpm-7.1/*
+/log/php-fpm-7.2/*
+/log/php-fpm-7.3/*
+/log/php-fpm-7.4/*
+/log/php-fpm-8.0/*
+/log/php-fpm-8.1/*
+!/log/.keepme
+!/log/*/.keepme
+
+
 # Ignore custom global vhost gen templates
 /cfg/vhost-gen/apache22.conf
 /cfg/vhost-gen/apache24.conf
@@ -49,6 +70,7 @@
 /cfg/mariadb-10.2/*.cnf
 /cfg/mariadb-10.3/*.cnf
 /cfg/mariadb-10.4/*.cnf
+/cfg/mariadb-10.5/*.cnf
 /cfg/percona-5.5/*.cnf
 /cfg/percona-5.6/*.cnf
 /cfg/percona-5.7/*.cnf
@@ -79,6 +101,7 @@
 /cfg/php-fpm-7.3/*.conf
 /cfg/php-fpm-7.4/*.conf
 /cfg/php-fpm-8.0/*.conf
+/cfg/php-fpm-8.1/*.conf
 
 # Ignore custom PHP-FPM startup scripts
 /autostart/*.sh
@@ -93,6 +116,7 @@
 /cfg/php-startup-7.3/*.sh
 /cfg/php-startup-7.4/*.sh
 /cfg/php-startup-8.0/*.sh
+/cfg/php-startup-8.1/*.sh
 
 # Ignorecustom Varnish configs
 /cfg/varnish-4/*.vcl
@@ -111,6 +135,7 @@
 /mod/php-fpm-7.3/*.so
 /mod/php-fpm-7.4/*.so
 /mod/php-fpm-8.0/*.so
+/mod/php-fpm-8.1/*.so
 
 # Ignore custom bash and other confi files
 /bash/*
@@ -128,7 +153,7 @@
 /.tests/tmp/*
 /.tests/www/*
 !/.tests/www/modules
-!/.tests/www/rproxy/js
+!/.tests/www/rproxy/js/index.js
 
 # Keep folders
 !.keepme
@@ -140,7 +165,6 @@
 
 ###### std ######
 .lock
-*.log
 
 ###### patches/diffs ######
 *.patch
@@ -204,4 +228,4 @@ $RECYCLE.BIN/
 *.bbproject
 
 ###### VS Code ######
-/.vscode
+/.vscode

.tests/tests/config-xdebug.sh

@@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
 . "${SCRIPT_PATH}/../scripts/.lib.sh"
 
 RETRIES=10
-DISABLED_VERSIONS=("8.0" "8.1")
+DISABLED_VERSIONS=("")
 
 
 echo
@@ -60,23 +60,42 @@ fi
 ### Xdebug default disabled
 ###
 printf "[TEST] Xdebug default disabled"
-if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_enable' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
-	printf "\\r[FAIL] Xdebug default disabled\\n"
-	run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_enable' || true"
-	exit 1
+if [ "${PHP_VERSION}" = "8.0" ] || [ "${PHP_VERSION}" = "8.1" ]; then
+	if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.mode' | grep -E 'develop.+develop' >/dev/null" "${RETRIES}" "" "0"; then
+		printf "\\r[FAIL] Xdebug default disabled\\n"
+		run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.mode' || true"
+		exit 1
+	else
+		printf "\\r[OK]   Xdebug default disabled\\n"
+	fi
 else
-	printf "\\r[OK]   Xdebug default disabled\\n"
+	if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_enable' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
+		printf "\\r[FAIL] Xdebug default disabled\\n"
+		run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_enable' || true"
+		exit 1
+	else
+		printf "\\r[OK]   Xdebug default disabled\\n"
+	fi
 fi
 
-
 ###
 ### Xdebug autostart disabled
 ###
 printf "[TEST] Xdebug autostart disabled"
-if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_autostart' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
-	printf "\\r[FAIL] Xdebug autostart disabled\\n"
-	run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_autostart' || true"
-	exit 1
+if [ "${PHP_VERSION}" = "8.0" ] || [ "${PHP_VERSION}" = "8.1" ]; then
+	if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.start_with_request' | grep -E 'default.+default' >/dev/null" "${RETRIES}" "" "0"; then
+		printf "\\r[FAIL] Xdebug autostart disabled\\n"
+		run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.start_with_request' || true"
+		exit 1
+	else
+		printf "\\r[OK]   Xdebug autostart disabled\\n"
+	fi
 else
-	printf "\\r[OK]   Xdebug autostart disabled\\n"
+	if  ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_autostart' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
+		printf "\\r[FAIL] Xdebug autostart disabled\\n"
+		run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_autostart' || true"
+		exit 1
+	else
+		printf "\\r[OK]   Xdebug autostart disabled\\n"
+	fi
 fi

CHANGELOG.md

@@ -7,6 +7,16 @@ major versions.
 ## Unreleased
 
 
+## Release v1.8.1 (2020-11-12)
+
+#### Fixed
+- Silence PHP warnings in phpmemcached and opcache GUIs
+- [#746](https://github.com/cytopia/devilbox/issues/746) Fix xdebug config for PHP 8.0 and 8.1
+
+#### Added
+- Added `check-config.sh` script to check against correct Devilbox configuration
+
+
 ## Release v1.8.0 (2020-11-08)
 
 #### Fixed

cfg/php-ini-8.0/devilbox-php.ini-xdebug

@@ -21,16 +21,15 @@
 [PHP]
 
 ; Xdebug
+; https://3.xdebug.org/docs/upgrade_guide
 ; Use these settings to enable Xdebug for PHP
 ; Make sure to read up on Xdebug some settings might significantly slow down requests.
 ; The following is just an example configuration and should be adjusted
-xdebug.default_enable   = On
-xdebug.profiler_enable  = On
-xdebug.remote_enable    = On
-xdebug.remote_autostart = On
-xdebug.remote_handler   = dbgp
-xdebug.remote_port      = 9000
-xdebug.idekey           = PHPSTORM
-xdebug.remote_log       = /var/log/php/xdebug.log
+xdebug.mode               = debug
+xdebug.start_with_request = yes
+xdebug.remote_handler     = dbgp
+xdebug.remote_port        = 9000
+xdebug.idekey             = PHPSTORM
+xdebug.remote_log         = /var/log/php/xdebug.log
 
 ; vim: set ft=dosini:

cfg/php-ini-8.1/devilbox-php.ini-xdebug

@@ -21,16 +21,15 @@
 [PHP]
 
 ; Xdebug
+; https://3.xdebug.org/docs/upgrade_guide
 ; Use these settings to enable Xdebug for PHP
 ; Make sure to read up on Xdebug some settings might significantly slow down requests.
 ; The following is just an example configuration and should be adjusted
-xdebug.default_enable   = On
-xdebug.profiler_enable  = On
-xdebug.remote_enable    = On
-xdebug.remote_autostart = On
-xdebug.remote_handler   = dbgp
-xdebug.remote_port      = 9000
-xdebug.idekey           = PHPSTORM
-xdebug.remote_log       = /var/log/php/xdebug.log
+xdebug.mode               = debug
+xdebug.start_with_request = yes
+xdebug.remote_handler     = dbgp
+xdebug.remote_port        = 9000
+xdebug.idekey             = PHPSTORM
+xdebug.remote_log         = /var/log/php/xdebug.log
 
 ; vim: set ft=dosini: