diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index ffec9956..0f5cf1bc 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); $DEVILBOX_VERSION = 'v1.0.1'; -$DEVILBOX_DATE = '2019-04-20'; +$DEVILBOX_DATE = '2019-04-27'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/CHANGELOG.md b/CHANGELOG.md index 860cc1d9..bb6fe396 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ major versions. #### Fixed - Fixed various typos in documentation - Fix CI tests: They still expected a mounted mail directory instead of a Docker volume +- Fix mods for PHP 8.0 +- Remove orphaned mentions of HOST_PATH_MYSQL_DATADIR #### Added - Documentation: Setup ProcessWire diff --git a/docker-compose.yml b/docker-compose.yml index 2eaaf1f9..683a26ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.84 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.86 hostname: php ## diff --git a/docs/_includes/links/apps.rst b/docs/_includes/links/apps.rst index 4bb06cd5..3b400f52 100644 --- a/docs/_includes/links/apps.rst +++ b/docs/_includes/links/apps.rst @@ -6,7 +6,7 @@ .. |ext_lnk_app_iphone_dns_override| raw:: html - + DNS Override diff --git a/docs/getting-started/start-the-devilbox.rst b/docs/getting-started/start-the-devilbox.rst index b146e03f..ad31d6b4 100644 --- a/docs/getting-started/start-the-devilbox.rst +++ b/docs/getting-started/start-the-devilbox.rst @@ -163,7 +163,7 @@ Open Devilbox intranet Once ``docker-compose up`` has finished and all or the selected container are up and running, you can visit the Devilbox intranet with your favorite Web browser at http://localhost or -http://127.0.0.1 (https://localhost or https:127.0.0.1 respectively). +http://127.0.0.1 (https://localhost or https://127.0.0.1 respectively). The Intranet start page will also show you all running and failed containers: diff --git a/env-example b/env-example index 1d560b2f..b176a693 100644 --- a/env-example +++ b/env-example @@ -521,11 +521,15 @@ HTTPD_NGINX_WORKER_CONNECTIONS=1024 ### ### MySQL root user password ### -### If $HOST_PATH_MYSQL_DATADIR already contains an existing -### mysql datadir, enter the password for the existing mysql database +### The password is required for the initial creation of the MySQL database +### as well as the Devilbox intranet to display schema and configuration settings. ### -### If $HOST_PATH_MYSQL_DATADIR is empty, choose a new password that -### will be applied +### If you change your MySQL root user password via mysql cli, phpMyAdmin or other tools +### after the database has been created, ensure to adjust the value here accordingly as well. +### +### If you only change this value here after the database has been created, +### the MySQL root user password will not actually be changed and the Devilbox intranet +### won't be able to connect to the MySQL service. ### MYSQL_ROOT_PASSWORD=