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

Merge branch 'master' into fix-850

Browse Source
This commit is contained in:
cytopia 2022-01-26 10:01:31 +01:00 committed by GitHub
commit 61246b5151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.devilbox/www/config.php
View File

@ -13,8 +13,8 @@ error_reporting(-1);
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
$DEVILBOX_VERSION = 'v1.9.2'; $DEVILBOX_VERSION = 'v1.9.3';
$DEVILBOX_DATE = '2021-06-04'; $DEVILBOX_DATE = '2022-01-25';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
// //
@ -136,7 +136,7 @@ function loadClass($class) {
* This pattern will match optional quoted string, 'my password' or "my password" * This pattern will match optional quoted string, 'my password' or "my password"
* or if there aren't any quotes, it will match up until the next space. * or if there aren't any quotes, it will match up until the next space.
*/ */
$_REDIS_PASS = []; $_REDIS_PASS = array();
preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER); preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER);
if (! empty($_REDIS_PASS)) { if (! empty($_REDIS_PASS)) {

10
CHANGELOG.md
View File

@ -6,6 +6,16 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl
## Unreleased ## Unreleased
## Release v1.9.3 (2022-01-24)
#### Fixed
- Updated PHP Docker Images: [#221](https://github.com/devilbox/docker-php-fpm/pull/221)
- Updated PHP Docker Images: [#222](https://github.com/devilbox/docker-php-fpm/pull/222)
- Update MySQL Docker Images: [#10](https://github.com/devilbox/docker-mysql/pull/10)
- Fixed documentation build issues
- Fixed intranet PHP code to work with legacy versions
## Release v1.9.2 (2021-06-04) ## Release v1.9.2 (2021-06-04)
#### Added #### Added

6
README.md
View File

@ -734,7 +734,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
| <small>date</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | <small>date</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <small>dba</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>dba</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>dom</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | <small>dom</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <small>enchant</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>enchant</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | 🗸 | 🗸 |
| <small>ereg</small> | | ✔ | ✔ | ✔ | ✔ | | | | | | | | | <small>ereg</small> | | ✔ | ✔ | ✔ | ✔ | | | | | | | |
| <small>exif</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>exif</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>FFI</small> | | | | | | | | | | 🗸 | ✔ | ✔ | | <small>FFI</small> | | | | | | | | | | 🗸 | ✔ | ✔ |
@ -756,7 +756,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
| <small>ldap</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>ldap</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>libxml</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | <small>libxml</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <small>mbstring</small> | ✔ | 🗸 | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | <small>mbstring</small> | ✔ | 🗸 | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <small>mcrypt</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>mcrypt</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | |
| <small>memcache</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>memcache</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>memcached</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>memcached</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>mhash</small> | | | | | ✔ | | | | | | | | | <small>mhash</small> | | | | | ✔ | | | | | | | |
@ -804,7 +804,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
| <small>sqlsrv</small> | | | | | | d | d | d | d | d | d | | | <small>sqlsrv</small> | | | | | | d | d | d | d | d | d | |
| <small>ssh2</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | <small>ssh2</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
| <small>standard</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | <small>standard</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <small>swoole</small> | | d | d | d | d | d | d | d | d | d | | | | <small>swoole</small> | | d | d | d | d | d | d | d | d | d | d | |
| <small>sysvmsg</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>sysvmsg</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>sysvsem</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>sysvsem</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <small>sysvshm</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | <small>sysvshm</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |

4
docker-compose.yml
View File

@ -95,7 +95,7 @@ services:
# PHP # PHP
# ------------------------------------------------------------ # ------------------------------------------------------------
php: php:
image: devilbox/php-fpm:${PHP_SERVER}-work-0.127 image: devilbox/php-fpm:${PHP_SERVER}-work-0.130
hostname: php hostname: php
## ##
@ -320,7 +320,7 @@ services:
# MySQL Database # MySQL Database
# ------------------------------------------------------------ # ------------------------------------------------------------
mysql: mysql:
image: devilbox/mysql:${MYSQL_SERVER}-0.7 image: devilbox/mysql:${MYSQL_SERVER}-0.8
hostname: mysql hostname: mysql
environment: environment:

2
docs/Makefile
View File

@ -28,7 +28,7 @@ linkcheck2:
--rm \ --rm \
$$(tty -s && echo "-it" || echo) \ $$(tty -s && echo "-it" || echo) \
-v $(PWD):/data \ -v $(PWD):/data \
cytopia/linkcheck -l -k -r 60 -t 30 -e rst -c '200,204' _includes/ cytopia/linkcheck -l -k -r 60 -t 30 -e rst -c '200,204,403' _includes/
linkcheck: linkcheck:
docker run \ docker run \

4
docs/_includes/links/documentation.rst
View File

@ -6,13 +6,13 @@
.. |ext_lnk_doc_bind_ttl| raw:: html .. |ext_lnk_doc_bind_ttl| raw:: html
<a target="_blank" href="http://www.zytrax.com/books/dns/apa/ttl.html"> <a target="_blank" href="https://bind9.readthedocs.io/en/latest/reference.html?highlight=ttl#the-ttl-directive">
BIND TTL <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> BIND TTL <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>
.. |ext_lnk_doc_bind_soa| raw:: html .. |ext_lnk_doc_bind_soa| raw:: html
<a target="_blank" href="http://www.zytrax.com/books/dns/ch8/soa.html"> <a target="_blank" href="https://bind9.readthedocs.io/en/latest/introduction.html?highlight=soa#secondary-servers">
BIND SOA <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> BIND SOA <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>

4
docs/_includes/links/examples.rst
View File

@ -72,13 +72,13 @@
.. |ext_lnk_example_phalcon_documentation| raw:: html .. |ext_lnk_example_phalcon_documentation| raw:: html
<a target="_blank" href="https://docs.phalconphp.com/latest/en/devtools-usage"> <a target="_blank" href="https://docs.phalcon.io/4.0/en/environments-devilbox">
Official Phalcon Documentation <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> Official Phalcon Documentation <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>
.. |ext_lnk_example_photon_cms| raw:: html .. |ext_lnk_example_photon_cms| raw:: html
<a target="_blank" href="https://photoncms.com/resources/installing"> <a target="_blank" href="https://docs.photoncms.com/">
Official Photon CMS Documentation <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> Official Photon CMS Documentation <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>

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

@ -209,7 +209,7 @@
.. |ext_lnk_tool_photon| raw:: html .. |ext_lnk_tool_photon| raw:: html
<a target="_blank" href="https://photoncms.com/resources/installing"> <a target="_blank" href="https://docs.photoncms.com/">
Photon CMS cli <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /> Photon CMS cli <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a> </a>

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

@ -148,7 +148,7 @@ Ensure to read the links below to understand why this problem exists and how the
The Docker documentation will also give you alternative caching options to consider. The Docker documentation will also give you alternative caching options to consider.
.. seealso:: .. seealso::
* https://github.com/cytopia/devilbox/issues/105#issuecomment-426229921 * https://github.com/cytopia/devilbox/issues/105
* https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076/281 * https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076/281
* https://docs.docker.com/docker-for-mac/osxfs/ * https://docs.docker.com/docker-for-mac/osxfs/
* :ref:`env_mount_options` * :ref:`env_mount_options`

2
docs/support/troubleshooting.rst
View File

@ -135,7 +135,7 @@ have to get support from the docker/for-mac GitHub repository or forum.
.. seealso:: .. seealso::
* https://github.com/cytopia/devilbox/issues/539 * https://github.com/cytopia/devilbox/issues/539
* https://github.com/docker/for-mac/issues/371#issuecomment-242047368 * https://github.com/docker/for-mac/issues/371
* https://forums.docker.com/t/no-space-left-on-device-error/10894 * https://forums.docker.com/t/no-space-left-on-device-error/10894