ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-19 12:57:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #568 from cytopia/update-php-container

Browse Source 
Fix mods for PHP-FPM 8.0
This commit is contained in:
cytopia 2019-04-27 16:36:22 +02:00 committed by GitHub
commit 6bc99d02b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devilbox/www/config.php
View File

@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
$DEVILBOX_VERSION = 'v1.0.1'; $DEVILBOX_VERSION = 'v1.0.1';
$DEVILBOX_DATE = '2019-04-20'; $DEVILBOX_DATE = '2019-04-27';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
// //

2
CHANGELOG.md
View File

@ -10,6 +10,8 @@ major versions.
#### Fixed #### Fixed
- Fixed various typos in documentation - Fixed various typos in documentation
- Fix CI tests: They still expected a mounted mail directory instead of a Docker volume - 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 #### Added
- Documentation: Setup ProcessWire - Documentation: Setup ProcessWire

2
docker-compose.yml
View File

@ -95,7 +95,7 @@ services:
# PHP # PHP
# ------------------------------------------------------------ # ------------------------------------------------------------
php: php:
image: devilbox/php-fpm:${PHP_SERVER}-work-0.84 image: devilbox/php-fpm:${PHP_SERVER}-work-0.86
hostname: php hostname: php
## ##

2
docs/_includes/links/apps.rst
View File

@ -6,7 +6,7 @@
.. |ext_lnk_app_iphone_dns_override| raw:: html .. |ext_lnk_app_iphone_dns_override| raw:: html
<a target="_blank" href="https://itunes.apple.com/us/app/dns-override/id1060830093"> <a target="_blank" href="https://www.dnsoverride.com">
DNS Override <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> DNS Override <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>

2
docs/getting-started/start-the-devilbox.rst
View File

@ -163,7 +163,7 @@ Open Devilbox intranet
Once ``docker-compose up`` has finished and all or the selected container are up and running, 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 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: The Intranet start page will also show you all running and failed containers:

12
env-example
View File

@ -521,11 +521,15 @@ HTTPD_NGINX_WORKER_CONNECTIONS=1024
### ###
### MySQL root user password ### MySQL root user password
### ###
### If $HOST_PATH_MYSQL_DATADIR already contains an existing ### The password is required for the initial creation of the MySQL database
### mysql datadir, enter the password for the existing 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 ### If you change your MySQL root user password via mysql cli, phpMyAdmin or other tools
### will be applied ### 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= MYSQL_ROOT_PASSWORD=