Merge pull request #861 from cytopia/release/v1.10.1

Release v1.10.1

.devilbox/www/config.php

@@ -13,8 +13,8 @@ error_reporting(-1);
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v1.9.2';
-$DEVILBOX_DATE = '2021-06-04';
+$DEVILBOX_VERSION = 'v1.10.1';
+$DEVILBOX_DATE = '2022-01-30';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //
@@ -127,15 +127,27 @@ function loadClass($class) {
 				break;
 
 			case 'Redis':
-
 				// Check if redis is using a password
 				$REDIS_ROOT_PASSWORD = '';
 
 				$_REDIS_ARGS = loadClass('Helper')->getEnv('REDIS_ARGS');
-				$_REDIS_PASS = preg_split("/--requirepass\s+/",  $_REDIS_ARGS);
-				if (is_array($_REDIS_PASS) && count($_REDIS_PASS)) {
-					// In case the option is specified multiple times, use the last effective one.
-					$_REDIS_PASS = $_REDIS_PASS[count($_REDIS_PASS)-1];
+
+				/*
+				 * 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.
+				 */
+				$_REDIS_PASS = array();
+				preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER);
+
+				if (! empty($_REDIS_PASS)) {
+					/*
+					 * In case the option is specified multiple times, use the last effective one.
+					 *
+					 * preg_match_all returns a multi-dimensional array, the first level array is in order of which was matched first,
+					 * and the password string is either matched in group 2 or group 3 which is always the end of the sub-array.
+					 */
+					$_REDIS_PASS = end(end($_REDIS_PASS));
+
 					if (strlen($_REDIS_PASS) > 0) {
 						$REDIS_ROOT_PASSWORD = $_REDIS_PASS;
 					}

.devilbox/www/htdocs/assets/js/html-email.js

@@ -4,8 +4,9 @@ class HtmlEmail extends HTMLElement {
     this.attachShadow({ mode: 'open' });
 
     let emailContent;
+    const templateId = this.dataset.templateId;
     try {
-      emailContent = window.atob(this.dataset.content);
+      emailContent = document.getElementById(templateId).innerHTML;
     } catch (error) {
       console.log(error);
       return;

.devilbox/www/htdocs/mail.php

@@ -24,6 +24,17 @@ require $VEN_DIR . DIRECTORY_SEPARATOR . 'Mail' . DIRECTORY_SEPARATOR .'mimeDeco
 require $LIB_DIR . DIRECTORY_SEPARATOR . 'Mail.php';
 require $LIB_DIR . DIRECTORY_SEPARATOR . 'Sort.php';
 
+
+if (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
+	$message = $_GET['delete'];
+	$MyMbox = new \devilbox\Mail('/var/mail/devilbox');
+	$MyMbox->delete($message);
+	header('Location: /mail.php');
+	exit();
+}
+
+
+
 //
 // Setup Sort/Order
 //
@@ -152,6 +163,7 @@ $messages = $MyMbox->get($sortOrderArr);
 								<th>From <?php echo $orderFrom;?></th>
 								<th>To <?php echo $orderTo;?></th>
 								<th>Subject <?php echo $orderSubj;?></th>
+								<th>Action</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -180,14 +192,15 @@ $messages = $MyMbox->get($sortOrderArr);
 									<td><?php echo htmlentities($structure->headers['from']);?></td>
 									<td><?php echo htmlentities($structure->headers['x-original-to']);?></td>
 									<td><?php echo htmlentities($structure->headers['subject']);?></td>
+									<td><a href="/mail.php?delete=<?php echo $data['num']-1;?>" title="Delete Email"><i class="fa fa-trash"></i></a></td>
 								</tr>
 								<tr></tr>
 								<tr id="mail-<?php echo $data['num'];?>" style="display:none">
 									<td></td>
-									<td colspan="4">
+									<td colspan="5">
 										<?php if ($body !== null): ?>
-											<html-email data-content="<?php echo base64_encode($body) ?>">
-											</html-email>
+											<template id="mail-body-<?=$data['num']?>"><?=$body?></template>
+											<html-email data-template-id="mail-body-<?=$data['num']?>"></html-email>
 										<?php else: ?>
 											<div class="alert alert-warning" role="alert">
 												No valid body found
@@ -213,12 +226,9 @@ $messages = $MyMbox->get($sortOrderArr);
 		<?php echo loadClass('Html')->getFooter(); ?>
 		<script>
 		$(function() {
-			$('.subject').each(function() {
-				$(this).click(function() {
-					var id = ($(this).attr('id'));
-					$('#mail-'+id).toggle();
-
-				})
+			$('.subject').click(function() {
+				var id = ($(this).attr('id'));
+				$('#mail-'+id).toggle();
 			})
 			// Handler for .ready() called.
 		});

.devilbox/www/include/lib/Mail.php

@@ -58,6 +58,18 @@ class Mail
 	}
 
 
+	/**
+	 * Deletes an emails
+	 *
+	 * Note: messages start with 0.
+	 *
+	 * @param int $message The number of the message to remove, or array of message ids to remove
+	 */
+	public function delete($message) {
+		$this->_Mbox->remove($message);
+	}
+
+
 	/**
 	 * Retrieve emails.
 	 *

.github/workflows/ci-smoke-linux.yml

@@ -199,8 +199,20 @@ jobs:
       - name: "Test Container"
         shell: bash
         run: |
+          retry() {
+            for n in $(seq 5); do
+              echo "[${n}/5] ${*}";
+              if eval "${*}"; then
+                echo "[SUCC] ${n}/5";
+                return 0;
+              fi;
+              sleep 5;
+              echo "[FAIL] ${n}/5";
+            done;
+            return 1;
+          }
           cd .tests/
-          make test-smoke-container
+          retry make test-smoke-container
         if: success() || failure()
 
       # ------------------------------------------------------------

.github/workflows/test-config.yml

@@ -213,8 +213,20 @@ jobs:
       - name: "Test Container"
         shell: bash
         run: |
+          retry() {
+            for n in $(seq 5); do
+              echo "[${n}/5] ${*}";
+              if eval "${*}"; then
+                echo "[SUCC] ${n}/t";
+                return 0;
+              fi;
+              sleep 5;
+              echo "[FAIL] ${n}/5";
+            done;
+            return 1;
+          }
           cd .tests/
-          make test-smoke-container
+          retry make test-smoke-container
         if: success() || failure()
 
       # ------------------------------------------------------------

.github/workflows/test-versions.yml

@@ -44,6 +44,8 @@ jobs:
           - "MYSQL_SERVER=mariadb-10.3"
           - "MYSQL_SERVER=mariadb-10.4"
           - "MYSQL_SERVER=mariadb-10.5"
+          - "MYSQL_SERVER=mariadb-10.6"
+          - "MYSQL_SERVER=mariadb-10.7"
           - "MYSQL_SERVER=percona-5.5"
           - "MYSQL_SERVER=percona-5.6"
           - "MYSQL_SERVER=percona-5.7"
@@ -287,8 +289,20 @@ jobs:
       - name: "Test Container"
         shell: bash
         run: |
+          retry() {
+            for n in $(seq 5); do
+              echo "[${n}/5] ${*}";
+              if eval "${*}"; then
+                echo "[SUCC] ${n}/t";
+                return 0;
+              fi;
+              sleep 5;
+              echo "[FAIL] ${n}/5";
+            done;
+            return 1;
+          }
           cd .tests/
-          make test-smoke-container
+          retry make test-smoke-container
         if: success() || failure()
 
       # ------------------------------------------------------------

CHANGELOG.md

@@ -6,6 +6,64 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl
 ## Unreleased
 
 
+## Release v1.10.1 (2022-01-30)
+
+
+#### Fixed
+- Fixed evaluation of `MASS_VHOST_SSL_GEN` env var [#830](https://github.com/cytopia/devilbox/issues/830)
+
+#### Added
+- Added feature to delete emails from within control center [#754](https://github.com/cytopia/devilbox/issues/754)
+
+#### Changed
+- Updated Nginx Stable [#35](https://github.com/devilbox/docker-nginx-stable/pull/35)
+- Updated Nginx Mainline [#37](https://github.com/devilbox/docker-nginx-mainline/pull/38)
+- Updated Apache 2.2 [#32](https://github.com/devilbox/docker-apache-2.2/pull/32)
+- Updated Apache 2.4 [#34](https://github.com/devilbox/docker-apache-2.4/pull/34)
+
+
+## Release v1.10.0 (2022-01-28)
+
+#### Fixed
+- Fixed mail.php to correctly show UTF chars in Body [#850](https://github.com/cytopia/devilbox/issues/850)
+- Fixed desc in env-example [#807](https://github.com/cytopia/devilbox/issues/807)
+
+#### Added
+- Added binary `sqlite3` to all PHP images [#856](https://github.com/cytopia/devilbox/issues/856)
+- Added binary `laravel` to PHP 8.0 and PHP 8.1 [#823](https://github.com/cytopia/devilbox/issues/823)
+- Added AVIF support in GD for PHP 8.1 [#834](https://github.com/cytopia/devilbox/issues/834)
+- Added extension `amqp` to PHP 8.0 and PHP 8.1 [#826](https://github.com/cytopia/devilbox/issues/826)
+- Added extension `uploadprogress` to PHP 8.0 and PHP 8.1 [#158](https://github.com/devilbox/docker-php-fpm/pull/158)
+- Added extension `imagick` to PHP 8.0 and PHP 8.1
+- Added extension `rdkafka` to PHP 8.0 and PHP 8.1
+- Added extension `xlswriter` to PHP 8.1
+- Added extension `pdo_dblib` to PHP 8.1
+- Added extension `uuid` to all PHP versions (except 5.2)
+- Added MySQL image: MariaDB 10.6
+- Added MySQL image: MariaDB 10.7
+
+#### Changed
+- Updated `php-cs-fixer` to latest version [#219](https://github.com/devilbox/docker-php-fpm/pull/219)
+- Updated Nginx Stable [#33](https://github.com/devilbox/docker-nginx-stable/pull/33)
+- Updated Nginx Stable [#34](https://github.com/devilbox/docker-nginx-stable/pull/34)
+- Updated Nginx Mainline [#36](https://github.com/devilbox/docker-nginx-mainline/pull/36)
+- Updated Nginx Mainline [#37](https://github.com/devilbox/docker-nginx-mainline/pull/37)
+- Updated Apache 2.2 [#30](https://github.com/devilbox/docker-apache-2.2/pull/30)
+- Updated Apache 2.2 [#31](https://github.com/devilbox/docker-apache-2.2/pull/31)
+- Updated Apache 2.4 [#32](https://github.com/devilbox/docker-apache-2.4/pull/32)
+- Updated Apache 2.4 [#33](https://github.com/devilbox/docker-apache-2.4/pull/33)
+
+
+## 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)
 
 #### Added

README.md

@@ -313,7 +313,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td><a target="_blank" title="PHP 7.2"          href="https://github.com/devilbox/docker-php-fpm">7.2</a></td>
       <td></td>
-      <td></td>
+      <td><a target="_blank" title="MariaDB 10.6"     href="https://github.com/devilbox/docker-mysql">10.6</a></td>
       <td></td>
       <td>...</td>
       <td></td>
@@ -325,7 +325,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td><a target="_blank" title="PHP 7.3"          href="https://github.com/devilbox/docker-php-fpm">7.3</a></td>
       <td></td>
-      <td></td>
+      <td><a target="_blank" title="MariaDB 10.7"     href="https://github.com/devilbox/docker-mysql">10.7</a></td>
       <td></td>
       <td><a target="_blank" title="PgSQL 12.3"       href="https://github.com/docker-library/postgres">12.3</a></td>
       <td></td>
@@ -347,7 +347,7 @@ Every single attachable container comes with many different versions. In order t
     <tr>
       <td></td>
       <td></td>
-      <td><a target="_blank" title="PHP 8.0"          href="https://github.com/devilbox/docker-php-fpm">8.0</a><sup>[2]</sup></td>
+      <td><a target="_blank" title="PHP 8.0"          href="https://github.com/devilbox/docker-php-fpm">8.0</a></td>
       <td></td>
       <td></td>
       <td></td>
@@ -359,7 +359,7 @@ Every single attachable container comes with many different versions. In order t
     <tr>
       <td></td>
       <td></td>
-      <td><a target="_blank" title="PHP 8.1"          href="https://github.com/devilbox/docker-php-fpm">8.1</a><sup>[2]</sup></td>
+      <td><a target="_blank" title="PHP 8.1"          href="https://github.com/devilbox/docker-php-fpm">8.1</a></td>
       <td></td>
       <td></td>
       <td></td>
@@ -373,7 +373,7 @@ Every single attachable container comes with many different versions. In order t
 
 <small><strong><sup>[1]</sup></strong> <strong>PHP 5.2</strong> is available to use, but it is not officially supported. The Devilbox intranet does not work with this version as PHP 5.2 does not support namespaces. Furthermore PHP 5.2 does only work with Apache 2.4, Nginx stable and Nginx mainline. It does not work with Apache 2.2. Use at your own risk.</small>
 
-<small><strong><sup>[2]</sup></strong> <strong>PHP 8.0 / PHP 8.1</strong> are upcoming unreleased versions of PHP, which are directly built out of their [official git branches](https://github.com/php/php-src/) every night to assure you will leverage their latest features.</small>
+<!--<small><strong><sup>[2]</sup></strong> <strong>PHP 8.0 / PHP 8.1</strong> are upcoming unreleased versions of PHP, which are directly built out of their [official git branches](https://github.com/php/php-src/) every night to assure you will leverage their latest features.</small>-->
 
 > **Documentation:**
 > [Change container versions](https://devilbox.readthedocs.io/en/latest/getting-started/change-container-versions.html)
@@ -721,7 +721,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 <!-- modules -->
 | Modules                       | <sup>PHP 5.2</sup> | <sup>PHP 5.3</sup> | <sup>PHP 5.4</sup> | <sup>PHP 5.5</sup> | <sup>PHP 5.6</sup> | <sup>PHP 7.0</sup> | <sup>PHP 7.1</sup> | <sup>PHP 7.2</sup> | <sup>PHP 7.3</sup> | <sup>PHP 7.4</sup> | <sup>PHP 8.0</sup> | <sup>PHP 8.1</sup> |
 |-------------------------------|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
-| <small>amqp</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |
+| <small>amqp</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>apc</small>            |         |    🗸    |    🗸    |    🗸    |    🗸    |         |         |         |         |         |         |         |
 | <small>apcu</small>           |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>bcmath</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
@@ -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>dba</small>            |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>dom</small>            |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>enchant</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| <small>enchant</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |    🗸    |    🗸    |
 | <small>ereg</small>           |         |    ✔    |    ✔    |    ✔    |    ✔    |         |         |         |         |         |         |         |
 | <small>exif</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>FFI</small>            |         |         |         |         |         |         |         |         |         |    🗸    |    ✔    |    ✔    |
@@ -747,7 +747,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>hash</small>           |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>iconv</small>          |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>igbinary</small>       |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
-| <small>imagick</small>        |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |
+| <small>imagick</small>        |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>imap</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>interbase</small>      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |         |
 | <small>intl</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>libxml</small>         |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>mbstring</small>       |    ✔    |    🗸    |    🗸    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>mcrypt</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| <small>mcrypt</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |
 | <small>memcache</small>       |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>memcached</small>      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>mhash</small>          |         |         |         |         |    ✔    |         |         |         |         |         |         |         |
@@ -772,7 +772,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>pcntl</small>          |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>pcre</small>           |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>PDO</small>            |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>pdo_dblib</small>      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |
+| <small>pdo_dblib</small>      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>PDO_Firebird</small>   |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>pdo_mysql</small>      |    ✔    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>PDO_OCI</small>        |         |         |         |         |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |
@@ -785,7 +785,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>posix</small>          |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>pspell</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>psr</small>            |         |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |
-| <small>rdkafka</small>        |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |         |         |
+| <small>rdkafka</small>        |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |
 | <small>readline</small>       |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>recode</small>         |    🗸    |    ✔    |    ✔    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |         |
 | <small>redis</small>          |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
@@ -804,17 +804,18 @@ 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>ssh2</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>sysvsem</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>sysvshm</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>tidy</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>tokenizer</small>      |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>uploadprogress</small> |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |
+| <small>uploadprogress</small> |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| <small>uuid</small>           |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>vips</small>           |         |         |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |
 | <small>wddx</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |         |
 | <small>xdebug</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
-| <small>xlswriter</small>      |         |         |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |
+| <small>xlswriter</small>      |         |         |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>xml</small>            |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>xmlreader</small>      |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>xmlrpc</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |

cfg/mariadb-10.6/devilbox-custom.cnf-example

@@ -0,0 +1,5 @@
+[mysqld]
+;key_buffer_size=16M
+
+[mysqldump]
+;quick

cfg/mariadb-10.7/devilbox-custom.cnf-example

@@ -0,0 +1,5 @@
+[mysqld]
+;key_buffer_size=16M
+
+[mysqldump]
+;quick

docker-compose.yml

@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.127
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.131
     hostname: php
 
     ##
@@ -221,7 +221,7 @@ services:
   # Web Server
   # ------------------------------------------------------------
   httpd:
-    image: devilbox/${HTTPD_SERVER}:0.36
+    image: devilbox/${HTTPD_SERVER}:0.39
     hostname: httpd
 
     environment:
@@ -320,7 +320,7 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: devilbox/mysql:${MYSQL_SERVER}-0.7
+    image: devilbox/mysql:${MYSQL_SERVER}-0.8
     hostname: mysql
 
     environment:
@@ -501,6 +501,8 @@ volumes:
   devilbox-mariadb-10.3:
   devilbox-mariadb-10.4:
   devilbox-mariadb-10.5:
+  devilbox-mariadb-10.6:
+  devilbox-mariadb-10.7:
   devilbox-percona-5.5:
   devilbox-percona-5.6:
   devilbox-percona-5.7:

docs/Makefile

@@ -28,7 +28,7 @@ linkcheck2:
 		--rm \
 		$$(tty -s && echo "-it" || echo) \
 		-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:
 	docker run \

docs/_includes/links/documentation.rst

@@ -6,13 +6,13 @@
 
 .. |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" />
    </a>
 
 .. |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" />
    </a>
 

docs/_includes/links/examples.rst

@@ -72,13 +72,13 @@
 
 .. |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" />
    </a>
 
 .. |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" />
    </a>
 

docs/_includes/links/tools.rst

@@ -209,7 +209,7 @@
 
 .. |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" />
    </a>
 

docs/getting-started/change-container-versions.rst

@@ -128,7 +128,7 @@ Now save the file and you can start the Devilbox again.
    # Navigate to the Devilbox directory
    host> cd path/to/devilbox
 
-   # Stop all container
+   # Start all container
    host> docker-compose up php httpd bind
 
 .. seealso:: :ref:`start_the_devilbox`
@@ -193,7 +193,7 @@ Now save the file and you can start the Devilbox again.
    # Navigate to the Devilbox directory
    host> cd path/to/devilbox
 
-   # Stop all container
+   # Start all container
    host> docker-compose up php httpd bind
 
 .. seealso:: :ref:`start_the_devilbox`

docs/getting-started/install-the-devilbox.rst

@@ -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.
 
 .. 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://docs.docker.com/docker-for-mac/osxfs/
    * :ref:`env_mount_options`

docs/howto/dns/add-project-dns-entry-on-win.rst

@@ -47,7 +47,7 @@ When using Docker for Windows you can use ``127.0.0.1`` for the IP address.
       127.0.0.1  project-1.loc
       127.0.0.1  www.project-1.loc
 
-3. Safe the file and verify the DNS entries with the ``ping`` command
+3. Save the file and verify the DNS entries with the ``ping`` command
 
    .. code-block:: bash
 

docs/intermediate/setup-auto-dns.rst

@@ -53,7 +53,7 @@ Then you need to ensure that :ref:`env_host_port_bind` is set to ``53``.
    host> vi .env
    HOST_PORT_BIND=53
 
-Before starting up the Devilbox, ensure that port ``53`` is not already used on ``127.0.0.1``.
+Before starting up the Devilbox, ensure that port ``53`` is not already used.
 
 .. code-block:: bash
    :emphasize-lines: 2

docs/support/troubleshooting.rst

@@ -135,7 +135,7 @@ have to get support from the docker/for-mac GitHub repository or forum.
 
 .. seealso::
    * 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
 
 

env-example

@@ -86,7 +86,7 @@ LOCAL_LISTEN_ADDR=
 ### with mass-virtual-hosting.
 ### It is also required for the internal DNS server to be setup.
 ###
-### Note: Only ALPHA ([a-zA-Z]+) characters are supported.
+### Note: In addition to period or dot character ('.'), only ALPHA ([a-zA-Z]+) characters are supported.
 ###
 ### Example:
 ###   TLD_SUFFIX=loc
@@ -292,6 +292,8 @@ HTTPD_SERVER=nginx-stable
 #MYSQL_SERVER=mariadb-10.3
 #MYSQL_SERVER=mariadb-10.4
 MYSQL_SERVER=mariadb-10.5
+#MYSQL_SERVER=mariadb-10.6
+#MYSQL_SERVER=mariadb-10.7
 #MYSQL_SERVER=percona-5.5
 #MYSQL_SERVER=percona-5.6
 #MYSQL_SERVER=percona-5.7