Updated images

.devilbox/www/config.php

@@ -13,8 +13,8 @@
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v3.0.0-beta-0.4';
-$DEVILBOX_DATE = '2023-01-30';
+$DEVILBOX_VERSION = 'v3.0.0-beta-0.5';
+$DEVILBOX_DATE = '2024-04-18';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

.devilbox/www/htdocs/assets/css/custom.css

@@ -169,6 +169,13 @@ nav.navbar {
 
 
 
+/* Overwrites for xdebug_info();
+-------------------------------------------------- */
+a.navbar-brand, a.nav-link, .nav-item.dropdown a  {
+	text-decoration: none !important;
+}
+
+
 
 /* mail.php;
 -------------------------------------------------- */

.devilbox/www/include/lib/Html.php

@@ -450,9 +450,9 @@ private function _buildMenu()
 					}
 					if ($el['path'] === '__OPCACHE__') {
 						if (version_compare(loadClass('Php')->getVersion(), '7.1', '<')){
-							$el['path'] = '/vendor/opcache/opcache-gui-2.5.4/';
+							$el['path'] = '/vendor/opcache-gui-2.5.4/';
 						} else {
-							$el['path'] = '/vendor/opcache/opcache-gui-3.5.4/';
+							$el['path'] = '/vendor/opcache-gui-3.5.4/';
 						}
 					}
 					if ($el['path'] === '__PHPCACHEADMIN__') {

.tests/tests/framework-wordpress.sh

@@ -56,10 +56,15 @@ VHOST="my-wordpress"
 # Create vhost dir
 create_vhost_dir "${VHOST}"
 
-
+# Switch to an earlier Wordpress version for older PHP versions
+if [ "${PHP_VERSION}" = "5.6" ]; then
+	WP_BRANCH=6.2.4
+else
+	WP_BRANCH="$(git ls-remote --tags https://github.com/WordPress/WordPress | sed 's/^.*tags\///g' | grep -E '^[.0-9]+$' | tr '-' '~' | sort -V | tail -1)"
+fi
 # Download Wordpress
 run "docker-compose exec --user devilbox -T php bash -c ' \
-	git clone https://github.com/WordPress/WordPress /shared/httpd/${VHOST}/wordpress \
+	git clone --depth=1 --single-branch --branch=${WP_BRANCH} https://github.com/WordPress/WordPress /shared/httpd/${VHOST}/wordpress \
 	&& ln -sf wordpress /shared/httpd/${VHOST}/htdocs'" \
 	"${RETRIES}" "${DVLBOX_PATH}"
 

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

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

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

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

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

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

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

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

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

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

cfg/mysql-8.1/devilbox-custom.cnf-example

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

cfg/mysql-8.2/devilbox-custom.cnf-example

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

cfg/mysql-8.3/devilbox-custom.cnf-example

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

check-config.sh

@@ -718,7 +718,9 @@ TLD_SUFFIX="$( get_env_value "TLD_SUFFIX" )"
 DNS_RECORD_WRONG=0
 while read -r project; do
 	VHOST="$( basename "${project}" ).${TLD_SUFFIX}"
-	if ! validate_dns "${VHOST}"; then
+	if [ "${VHOST:0:1}" == "." ]; then
+      log_debug "Project '${VHOST}' has skipped"
+	elif ! validate_dns "${VHOST}"; then
 		log_err "Project '${VHOST}' has no valid DNS record"
 		RET_CODE=$(( RET_CODE + 1))
 		DNS_RECORD_WRONG=1

docker-compose.yml

@@ -34,7 +34,7 @@ services:
   # Bind (DNS Server)
   # ------------------------------------------------------------
   bind:
-    image: cytopia/bind:alpine-0.35
+    image: johnea/bind:alpine
     hostname: bind
     restart: always
     ports:
@@ -233,7 +233,7 @@ services:
   # Web Server
   # ------------------------------------------------------------
   httpd:
-    image: devilbox/${HTTPD_SERVER}:${HTTPD_FLAVOUR:-alpine}-1.2
+    image: johnea/webserver:${HTTPD_SERVER}-${HTTPD_FLAVOUR:-alpine}
     hostname: httpd
 
     environment:
@@ -345,7 +345,7 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: devilbox/mysql:${MYSQL_SERVER}-0.21
+    image: johnea/mysql:${MYSQL_SERVER}
     hostname: mysql
 
     environment:
@@ -519,6 +519,9 @@ volumes:
   devilbox-mysql-5.6:
   devilbox-mysql-5.7:
   devilbox-mysql-8.0:
+  devilbox-mysql-8.1:
+  devilbox-mysql-8.2:
+  devilbox-mysql-8.3:
   devilbox-mariadb-5.5:
   devilbox-mariadb-10.0:
   devilbox-mariadb-10.1:
@@ -531,6 +534,11 @@ volumes:
   devilbox-mariadb-10.8:
   devilbox-mariadb-10.9:
   devilbox-mariadb-10.10:
+  devilbox-mariadb-10.11:
+  devilbox-mariadb-11.0:
+  devilbox-mariadb-11.1:
+  devilbox-mariadb-11.2:
+  devilbox-mariadb-11.3:
   devilbox-percona-5.5:
   devilbox-percona-5.6:
   devilbox-percona-5.7:
@@ -563,6 +571,8 @@ volumes:
   devilbox-pgsql-14-alpine:
   devilbox-pgsql-15:
   devilbox-pgsql-15-alpine:
+  devilbox-pgsql-16:
+  devilbox-pgsql-16-alpine:
   devilbox-pgsql-latest:
   devilbox-pgsql-alpine:
 
@@ -578,4 +588,6 @@ volumes:
   devilbox-mongo-4.2:
   devilbox-mongo-4.4:
   devilbox-mongo-5.0:
+  devilbox-mongo-6.0:
+  devilbox-mongo-7.0:
   devilbox-mongo-latest:

env-example

@@ -295,6 +295,9 @@ HTTPD_SERVER=nginx-stable
 #MYSQL_SERVER=mysql-5.6
 #MYSQL_SERVER=mysql-5.7
 #MYSQL_SERVER=mysql-8.0
+#MYSQL_SERVER=mysql-8.1
+#MYSQL_SERVER=mysql-8.2
+#MYSQL_SERVER=mysql-8.3
 #MYSQL_SERVER=percona-5.5
 #MYSQL_SERVER=percona-5.6
 #MYSQL_SERVER=percona-5.7
@@ -306,11 +309,16 @@ 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.6
 #MYSQL_SERVER=mariadb-10.7
 #MYSQL_SERVER=mariadb-10.8
 #MYSQL_SERVER=mariadb-10.9
 #MYSQL_SERVER=mariadb-10.10
+MYSQL_SERVER=mariadb-10.11
+#MYSQL_SERVER=mariadb-11.0
+#MYSQL_SERVER=mariadb-11.1
+#MYSQL_SERVER=mariadb-11.2
+#MYSQL_SERVER=mariadb-11.3
 
 
 ###
@@ -348,9 +356,11 @@ MYSQL_SERVER=mariadb-10.6
 #PGSQL_SERVER=13
 #PGSQL_SERVER=13-alpine
 #PGSQL_SERVER=14
-PGSQL_SERVER=14-alpine
+#PGSQL_SERVER=14-alpine
 #PGSQL_SERVER=15
-#PGSQL_SERVER=15-alpine
+PGSQL_SERVER=15-alpine
+#PGSQL_SERVER=16
+#PGSQL_SERVER=16-alpine
 #PGSQL_SERVER=latest
 #PGSQL_SERVER=alpine
 
@@ -379,9 +389,11 @@ PGSQL_SERVER=14-alpine
 #REDIS_SERVER=6.0
 #REDIS_SERVER=6.0-alpine
 #REDIS_SERVER=6.2
-REDIS_SERVER=6.2-alpine
+#REDIS_SERVER=6.2-alpine
 #REDIS_SERVER=7.0
 #REDIS_SERVER=7.0-alpine
+#REDIS_SERVER=7.2
+REDIS_SERVER=7.2-alpine
 #REDIS_SERVER=latest
 #REDIS_SERVER=alpine
 
@@ -427,7 +439,9 @@ MEMCD_SERVER=1.6-alpine
 #MONGO_SERVER=4.0
 #MONGO_SERVER=4.2
 #MONGO_SERVER=4.4
-MONGO_SERVER=5.0
+#MONGO_SERVER=5.0
+MONGO_SERVER=6.0
+#MONGO_SERVER=7.0
 #MONGO_SERVER=latest
 
 

update-docker.sh

@@ -37,8 +37,8 @@ CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 ### BIND
 ###
 if [ "${WHICH}" = "all" ] || [ "${WHICH}" = "bind" ]; then
-	TAG="$( grep '^[[:space:]]*image:[[:space:]]*cytopia/bind' "${CWD}/docker-compose.yml" | sed 's/^.*://g' )"
-	docker pull cytopia/bind:${TAG}
+	TAG="$( grep '^[[:space:]]*image:[[:space:]]*johnea/bind' "${CWD}/docker-compose.yml" | sed 's/^.*://g' )"
+	docker pull johnea/bind:${TAG}
 fi
 
 
@@ -58,10 +58,13 @@ fi
 ### HTTPD
 ###
 if [ "${WHICH}" = "all" ] || [ "${WHICH}" = "httpd" ]; then
-	SUFFIX="$( grep -E '^\s+image:\s+devilbox/\${HTTPD_SERVER' "${CWD}/docker-compose.yml" | sed 's/.*://g' )"
+	SUFFIX="$( grep -Eo '^#*HTTPD_FLAVOUR=[-a-z]+[.0-9]*' "${CWD}/env-example" | sed 's/.*=//g' )"
 	IMAGES="$( grep -Eo '^#*HTTPD_SERVER=[-a-z]+[.0-9]*' "${CWD}/env-example" | sed 's/.*=//g' )"
+	if [ -z "${SUFFIX}" ]; then
+		SUFFIX="$( grep -Eo '^\s+image:\s+johnea/webserver:\${HTTPD_SERVER}-\${HTTPD_FLAVOUR:[-a-z]+[.0-9]*' "${CWD}/docker-compose.yml" | sed 's/.*-//g' )";
+	fi
 	echo "${IMAGES}" | while read version ; do
-		docker pull devilbox/${version}:${SUFFIX}
+		docker pull johnea/webserver:${version}-${SUFFIX}
 	done
 fi
 
@@ -72,7 +75,7 @@ fi
 if [ "${WHICH}" = "all" ] || [ "${WHICH}" = "mysql" ]; then
 	IMAGES="$( grep -Eo '^#*MYSQL_SERVER=[-a-z]+[.0-9]*' "${CWD}/env-example" | sed 's/.*=//g' )"
 	echo "${IMAGES}" | while read version ; do
-		docker pull devilbox/mysql:${version}
+		docker pull johnea/mysql:${version}
 	done
 fi