Merge branch 'master' into master

.env.example

@@ -43,8 +43,8 @@ PHP_VERSION=7.4
 
 ### Phalcon Version ###########################################
 
-# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+
-PHALCON_VERSION=4.0.5
+# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 5.0.0+
+PHALCON_VERSION=5.0.0
 
 ### PHP Interpreter #######################################
 
@@ -205,6 +205,8 @@ WORKSPACE_INSTALL_TRADER=false
 WORKSPACE_PROTOC_VERSION=latest
 WORKSPACE_INSTALL_MEMCACHED=true
 WORKSPACE_INSTALL_EVENT=false
+WORKSPACE_INSTALL_DNSUTILS=true
+WORKSPACE_XDEBUG_PORT=9003
 WORKSPACE_VITE_PORT=5173
 
 ### PHP_FPM ###############################################
@@ -279,6 +281,7 @@ PHP_FPM_INSTALL_DOCKER_CLIENT=false
 PHP_FPM_DEFAULT_LOCALE=POSIX
 PHP_FPM_XDEBUG_PORT=9003
 PHP_FPM_INSTALL_EVENT=false
+PHP_FPM_INSTALL_DNSUTILS=true
 
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
@@ -379,6 +382,7 @@ APACHE_PHP_UPSTREAM_TIMEOUT=60
 APACHE_DOCUMENT_ROOT=/var/www/
 APACHE_SSL_PATH=./apache2/ssl/
 APACHE_INSTALL_HTTP2=false
+APACHE_FOR_MAC_M1=false
 
 ### MYSQL #################################################
 
@@ -392,8 +396,8 @@ MYSQL_ENTRYPOINT_INITDB=./mysql/docker-entrypoint-initdb.d
 
 ### CLICKHOUSE #################################################
 
-CLICKHOUSE_VERSION=20.9.4.76
-CLICKHOUSE_GOSU_VERSION=1.10
+CLICKHOUSE_VERSION=22.2.2.1
+CLICKHOUSE_GOSU_VERSION=1.14
 CLICKHOUSE_CUSTOM_CONFIG=./clickhouse/config.xml
 CLICKHOUSE_USERS_CUSTOM_CONFIG=./clickhouse/users.xml
 CLICKHOUSE_USER=default
@@ -1051,3 +1055,7 @@ NATS_ROUTE_PORT=8222
 ### SOKETI ##################################################
 SOKETI_PORT=6001
 SOKETI_METRICS_SERVER_PORT=9601
+
+### ONEDEV ##################################################
+ONEDEV_HTTP_PORT=6610
+ONEDEV_SSH_PORT=6611