From 5cd37b9f17669aa3c4a72fa553bd863b9b40410a Mon Sep 17 00:00:00 2001
From: DavidLiu <abcxyz02@163.com>
Date: Sat, 23 Jul 2022 15:38:58 +0800
Subject: [PATCH 01/29] Change ngx_brotli mirror of Openresty

https://www.downsoft.cn/software/linux/nginx/ngx_brotli.tar.gz mirror is no longer available
---
 openresty/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openresty/Dockerfile b/openresty/Dockerfile
index 50198cb1..f90803de 100644
--- a/openresty/Dockerfile
+++ b/openresty/Dockerfile
@@ -58,7 +58,7 @@ ARG RESTY_CONFIG_OPTIONS_MORE="\
     --with-http_iconv_module \
     --add-module=/tmp/nginx-ct-master \
     --add-module=/tmp/nginx-dav-ext-module-master \
-    --add-module=/tmp/ngx_brotli \
+    --add-module=/tmp/ngx_brotli-master \
     --add-module=/tmp/ngx_cache_purge-master \
     --add-module=/tmp/ngx_http_substitutions_filter_module-master \
     "
@@ -166,7 +166,7 @@ RUN apk add --no-cache --virtual .build-deps \
     && tar xzf nginx-ct.tar.gz \
     && curl -fSL https://github.com/arut/nginx-dav-ext-module/archive/master.tar.gz -o nginx-dav-ext-module.tar.gz \
     && tar xzf nginx-dav-ext-module.tar.gz \
-    && curl -fSL https://www.downsoft.cn/software/linux/nginx/ngx_brotli.tar.gz -o ngx_brotli.tar.gz \
+    && curl -fSL https://github.com/google/ngx_brotli/archive/master.tar.gz -o ngx_brotli.tar.gz \
     && tar xzf ngx_brotli.tar.gz \
     && curl -fSL https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/master.tar.gz -o ngx_http_substitutions_filter_module.tar.gz \
     && tar xzf ngx_http_substitutions_filter_module.tar.gz \

From 7e4bba514a5575304b712bfe4a8822bb647ff6da Mon Sep 17 00:00:00 2001
From: davlet42 <a.davletshin@alef.im>
Date: Sat, 30 Jul 2022 14:08:23 +0300
Subject: [PATCH 02/29] Updating the Clickhouse and Gosu versions

---
 .env.example          | 4 ++--
 clickhouse/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index e79c3122..3277e883 100644
--- a/.env.example
+++ b/.env.example
@@ -389,8 +389,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
diff --git a/clickhouse/Dockerfile b/clickhouse/Dockerfile
index 853c14df..c3d1aab8 100644
--- a/clickhouse/Dockerfile
+++ b/clickhouse/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
-ARG CLICKHOUSE_VERSION=20.9.4.76
-ARG CLICKHOUSE_GOSU_VERSION=1.10
+ARG CLICKHOUSE_VERSION=22.2.2.1
+ARG CLICKHOUSE_GOSU_VERSION=1.14
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \

From e144605e635424e336ee8bc4bd3387714b04a3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20Bra=CC=8Aten?= <terje@linx.net>
Date: Fri, 5 Aug 2022 14:56:04 +0100
Subject: [PATCH 03/29] Use the maintained version of maildev

---
 maildev/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maildev/Dockerfile b/maildev/Dockerfile
index c12e3ba3..6513fb4d 100644
--- a/maildev/Dockerfile
+++ b/maildev/Dockerfile
@@ -1,5 +1,5 @@
-FROM djfarrelly/maildev
+FROM maildev/maildev
 
-LABEL maintainer="Maxime Hélias <maximehelias16@gmail.com>"
+LABEL maintainer="Dan Farrelly"
 
 EXPOSE 80 25

From 8357ef0b8cfaf20214489e9cf18c02b8f6148727 Mon Sep 17 00:00:00 2001
From: wangxiao <wangxiao@guadoutech.com>
Date: Mon, 22 Aug 2022 17:53:58 +0800
Subject: [PATCH 04/29] add onedev(Self-hosted Git Server with CI/CD and
 Kanban) https://github.com/theonedev/onedev

---
 .env.example       |  4 ++++
 docker-compose.yml | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/.env.example b/.env.example
index fcf07853..9f1e3691 100644
--- a/.env.example
+++ b/.env.example
@@ -1050,3 +1050,7 @@ NATS_ROUTE_PORT=8222
 ### SOKETI ##################################################
 SOKETI_PORT=6001
 SOKETI_METRICS_SERVER_PORT=9601
+
+### ONEDEV ##################################################
+ONEDEV_HTTP_PORT=6610
+ONEDEV_SSH_PORT=6611
diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..c708e0d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2075,3 +2075,17 @@ services:
         - ${TARANTOOL_ADMIN_PORT}:80
       networks:
         - backend
+
+  ### onedev ####################################################
+    onedev:
+      image: 1dev/server
+      ports:
+        - "${ONEDEV_HTTP_PORT}:6610"
+        - "${ONEDEV_SSH_PORT}:6611"
+      volumes:
+        - ${DATA_PATH_HOST}/onedev:/opt/onedev
+        - /var/run/docker.sock:/var/run/docker.sock
+      networks:
+        - frontend
+        - backend
+      restart: always

From f0a26307d124b18ec0e81d833a1714a157524581 Mon Sep 17 00:00:00 2001
From: Procademy <info@procademy.nl>
Date: Wed, 21 Sep 2022 11:03:44 +0200
Subject: [PATCH 05/29] Use correct Caddy repo

---
 caddy/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index e2af8fde..b9053dad 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,4 +1,4 @@
-FROM caddy/caddy:latest
+FROM caddy:latest
 
 COPY ./caddy/Caddyfile /etc/caddy/Caddyfile
 

From 84854c8f0d6578dcc75fb151f787c70d90e38301 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 06:01:13 +0800
Subject: [PATCH 06/29] update phalcon support

---
 .env.example          |  4 ++--
 php-fpm/Dockerfile    | 18 +++++-------------
 php-worker/Dockerfile | 28 ++++++++++++----------------
 workspace/Dockerfile  | 19 ++++++-------------
 4 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/.env.example b/.env.example
index fcf07853..6d1721ed 100644
--- a/.env.example
+++ b/.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 #######################################
 
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..280e0682 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -854,20 +854,12 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
-    && git clone https://github.com/jbboehr/php-psr.git \
-    && cd php-psr \
-    && phpize \
-    && ./configure \
-    && make \
-    && make test \
-    && make install \
-    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
-    && unzip -d /tmp/ /tmp/cphalcon.zip \
-    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
-    && ./install \
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-    && rm -rf /tmp/cphalcon* \
+    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+    && docker-php-ext-enable phalcon \
 ;fi
 
 ###########################################################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 687ba903..b45d413d 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -310,24 +310,20 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
 
 # Install Phalcon ext
 ARG INSTALL_PHALCON=false
-ARG PHALCON_VERSION
-ENV PHALCON_VERSION ${PHALCON_VERSION}
+ARG LARADOCK_PHALCON_VERSION
+ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
+
+# Copy phalcon configration
+COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-  apk --update add unzip gcc make re2c bash\
-  && git clone https://github.com/jbboehr/php-psr.git \
-  && cd php-psr \
-  && phpize \
-  && ./configure \
-  && make \
-  && make test \
-  && make install \
-  && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.zip \
-  && unzip -d /tmp/ /tmp/cphalcon.zip \
-  && cd /tmp/cphalcon-${PHALCON_VERSION}/build \
-  && ./install \
-  && rm -rf /tmp/cphalcon* \
-  ;fi
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
+    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+    && docker-php-ext-enable phalcon \
+;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..60565b1b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1321,23 +1321,16 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
+# Copy phalcon configration
+COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
+
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get update && apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
-    && git clone https://github.com/jbboehr/php-psr.git \
-    && cd php-psr \
-    && phpize \
-    && ./configure \
-    && make \
-    && make test \
-    && make install \
-    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
-    && unzip -d /tmp/ /tmp/cphalcon.zip \
-    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
-    && ./install \
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-    && rm -rf /tmp/cphalcon* \
+    && docker-php-ext-enable phalcon \
 ;fi
 
 ###########################################################################

From f9d7fc3b120e289b3dc2d2f69f896c685211a085 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:09:29 +0800
Subject: [PATCH 07/29] fixed

---
 php-fpm/Dockerfile    | 3 ---
 php-worker/Dockerfile | 3 ---
 workspace/Dockerfile  | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 280e0682..c71118f9 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -850,9 +850,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index b45d413d..9ae03ae0 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -313,9 +313,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 60565b1b..fccfd955 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1321,9 +1321,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \

From 72d8ec8f21280f3da9f5b24c8fa34357908a33fc Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:17:24 +0800
Subject: [PATCH 08/29] fixed

---
 php-fpm/Dockerfile    | 3 ++-
 php-worker/Dockerfile | 3 ++-
 workspace/Dockerfile  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index c71118f9..3ed7df58 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,7 +851,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 9ae03ae0..00ee062d 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,7 +314,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index fccfd955..e64dc7c9 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,7 +1322,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From 369a5040d432a6f189435cdf380dcc3adf2e82e6 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:19:13 +0800
Subject: [PATCH 09/29] fixed

---
 php-fpm/Dockerfile    | 1 +
 php-worker/Dockerfile | 1 +
 workspace/Dockerfile  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 3ed7df58..182d382c 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -852,6 +852,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 00ee062d..09a2c9e3 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -315,6 +315,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index e64dc7c9..043acace 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1323,6 +1323,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From ff48d295f64b043afdc9f2ba8265e1e6c669d2eb Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:22:10 +0800
Subject: [PATCH 10/29] fixed

---
 php-fpm/Dockerfile    |  4 ++--
 php-worker/Dockerfile | 12 ++++++------
 workspace/Dockerfile  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 182d382c..6c49d2ef 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,9 +851,9 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 09a2c9e3..5d8a474c 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,13 +314,13 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
-    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini; \
+    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
+    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
+    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini; \
     && docker-php-ext-enable phalcon \
 ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 043acace..2eaeb3d7 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,9 +1322,9 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From edf4baac444aedadfb3be6b9aa3900e6b1c79b22 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:23:21 +0800
Subject: [PATCH 11/29] fixed

---
 php-fpm/Dockerfile    | 2 +-
 php-worker/Dockerfile | 2 +-
 workspace/Dockerfile  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 6c49d2ef..d726bcc2 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -853,7 +853,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-5.0.0 \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 5d8a474c..a45cf33c 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -316,7 +316,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-5.0.0 \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini; \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 2eaeb3d7..386322ba 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1324,7 +1324,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-5.0.0 ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
     && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From 818488b8620da0bebe912644f1dc0097839c6566 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:30:59 +0800
Subject: [PATCH 12/29] fixed

---
 php-fpm/Dockerfile    | 19 ++++++++++---------
 php-worker/Dockerfile | 19 ++++++++++---------
 workspace/Dockerfile  | 19 ++++++++++---------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d726bcc2..94236b68 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,15 +851,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-5.0.0 \
-    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-    && docker-php-ext-enable phalcon \
-;fi
+      apt-get update -yqq \
+      && pecl channel-update pecl.php.net \
+      && apt-get install -yqq libpcre3-dev; \
+      pecl install phalcon-5.0.0; \
+      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
+      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      && docker-php-ext-enable phalcon \
+  ;fi
 
 ###########################################################################
 # APCU:
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index a45cf33c..908fcc57 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,15 +314,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-5.0.0 \
-    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini; \
-    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
-    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
-    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini; \
-    && docker-php-ext-enable phalcon \
-;fi
+      apt-get update -yqq \
+      && pecl channel-update pecl.php.net \
+      && apt-get install -yqq libpcre3-dev; \
+      pecl install phalcon-5.0.0; \
+      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
+      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      && docker-php-ext-enable phalcon \
+  ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 386322ba..cccd8268 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,15 +1322,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-5.0.0 ; \
-    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-    && docker-php-ext-enable phalcon \
-;fi
+      apt-get update -yqq \
+      && pecl channel-update pecl.php.net \
+      && apt-get install -yqq libpcre3-dev; \
+      pecl install phalcon-5.0.0; \
+      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
+      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      && docker-php-ext-enable phalcon \
+  ;fi
 
 ###########################################################################
 USER root

From 6d038087141359f2d7d45da7a13220e7718b276a Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 10:25:20 +0800
Subject: [PATCH 13/29] fixed

---
 php-fpm/Dockerfile    | 5 ++---
 php-worker/Dockerfile | 5 ++---
 workspace/Dockerfile  | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 94236b68..34f2f6aa 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -854,9 +854,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 908fcc57..359f24c8 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -317,9 +317,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index cccd8268..d1c18cf4 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1325,9 +1325,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \

From e4fe092f26db7fb60d033e55fa53468d3f74ca56 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 11:31:56 +0800
Subject: [PATCH 14/29] fixed

---
 php-fpm/Dockerfile    | 6 +++---
 php-worker/Dockerfile | 6 +++---
 workspace/Dockerfile  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 34f2f6aa..f867d4cf 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -855,9 +855,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
   ;fi
 
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 359f24c8..63ebfc5f 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -318,9 +318,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
   ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d1c18cf4..dddaa9ac 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,9 +1326,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
+      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
   ;fi
 

From 68f63646468356915c0f901640854968aa521f3c Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 11:56:31 +0800
Subject: [PATCH 15/29] fixed

---
 php-fpm/Dockerfile    | 2 +-
 php-worker/Dockerfile | 2 +-
 workspace/Dockerfile  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index f867d4cf..ffb9a0f8 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -858,7 +858,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-      && docker-php-ext-enable phalcon \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ###########################################################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 63ebfc5f..a0eb12e6 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -321,7 +321,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-      && docker-php-ext-enable phalcon \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index dddaa9ac..b2086c1b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1329,7 +1329,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-      && docker-php-ext-enable phalcon \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ###########################################################################

From 2e31c037cd95835beb25a988f7ae79f96a0a2bb4 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 13:03:28 +0800
Subject: [PATCH 16/29] fixed

---
 php-fpm/Dockerfile    | 3 ---
 php-worker/Dockerfile | 8 +++-----
 workspace/Dockerfile  | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index ffb9a0f8..d962fdc2 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -855,9 +855,6 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       docker-php-ext-enable phalcon \
   ;fi
 
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index a0eb12e6..d384c017 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -318,11 +318,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-      docker-php-ext-enable phalcon \
-  ;fi
+      docker-php-ext-enable phalcon; \
+      php -m | grep -q 'phalcon' \
+    ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index b2086c1b..d650d7e1 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,10 +1326,10 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      # echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
-      # && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
-      docker-php-ext-enable phalcon \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
+      echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
+      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini; \
+      php -m | grep -q 'phalcon'; \
   ;fi
 
 ###########################################################################

From 59bf17ffcc783fa7da6e7e8881e82e574f7ebe46 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 13:04:33 +0800
Subject: [PATCH 17/29] fixed

---
 workspace/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d650d7e1..90495fcd 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1329,7 +1329,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
       echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
       ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini; \
-      php -m | grep -q 'phalcon'; \
+      php -m | grep -q 'phalcon' \
   ;fi
 
 ###########################################################################

From 643669445c90936b0b69e84482b8f826c0d8e852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
 <59930161+polarikus@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:29:34 +0300
Subject: [PATCH 18/29] Update .env.example

---
 .env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example b/.env.example
index fcf07853..d3bfd708 100644
--- a/.env.example
+++ b/.env.example
@@ -378,6 +378,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 #################################################
 

From 05536fb6a10a6e84b35ff07376c67797cc3b56b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
 <59930161+polarikus@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:31:34 +0300
Subject: [PATCH 19/29] Update docker-compose.yml

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..6fd901ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -485,6 +485,7 @@ services:
           - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT}
           - DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT}
           - APACHE_INSTALL_HTTP2=${APACHE_INSTALL_HTTP2}
+          - M1=${APACHE_FOR_MAC_M1}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
         - ${APACHE_HOST_LOG_PATH}:/var/log/apache2

From db1b30ecf229097b03b942fd630c9541f970d7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
 <59930161+polarikus@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:49:08 +0300
Subject: [PATCH 20/29] Update Dockerfile

script for M1
---
 apache2/Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apache2/Dockerfile b/apache2/Dockerfile
index 9fd43154..a24cc9c4 100644
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@@ -29,4 +29,13 @@ ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
 CMD ["/bin/bash", "/opt/startup.sh"]
 
-EXPOSE 80 443
\ No newline at end of file
+EXPOSE 80 443
+
+ARG APACHE_FOR_MAC_M1=false
+
+RUN if [ ${APACHE_FOR_MAC_M1} = true ]; then \
+    # Change application source from deb.debian.org to aliyun source
+    wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-arm64-linux" && \
+    chmod +x "/usr/local/bin/go-replace" && \
+    "/usr/local/bin/go-replace" --version \
+;fi

From 98c5d7ba641cd68bf5dace35a0f74c0a1f40e4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
 <59930161+polarikus@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:52:29 +0300
Subject: [PATCH 21/29] Update docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6fd901ce..82a153c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -485,7 +485,7 @@ services:
           - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT}
           - DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT}
           - APACHE_INSTALL_HTTP2=${APACHE_INSTALL_HTTP2}
-          - M1=${APACHE_FOR_MAC_M1}
+          - APACHE_FOR_MAC_M1=${APACHE_FOR_MAC_M1}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
         - ${APACHE_HOST_LOG_PATH}:/var/log/apache2

From ed48e4ee1babf5eb0b5fe7909d706da22af7e74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
 <59930161+polarikus@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:05:01 +0300
Subject: [PATCH 22/29] Update index.md

Add ## Apache2 container won't start on mac m1
---
 DOCUMENTATION/content/help/index.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/DOCUMENTATION/content/help/index.md b/DOCUMENTATION/content/help/index.md
index c10bb00a..8f3e6557 100644
--- a/DOCUMENTATION/content/help/index.md
+++ b/DOCUMENTATION/content/help/index.md
@@ -127,3 +127,21 @@ WORKSPACE_INSTALL_LIBPNG=true
 docker-compose build workspace
 ```
 
+## Apache2 container won't start on mac m1
+
+To fix the problem you can follow those steps
+
+1 - Open the `.env`.
+
+2 - Search for `APACHE_FOR_MAC_M1` or add the key, if missing.
+
+3 - Set the value to true:
+
+```dotenv
+APACHE_FOR_MAC_M1=true
+```
+4 - Finally rebuild the workspace image
+
+```bash
+docker-compose build apache2
+```

From 06ff2a34a074e0364056f2f0f8b997d880bb6b2e Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Wed, 5 Oct 2022 19:05:19 +0800
Subject: [PATCH 23/29] fixed

---
 workspace/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 90495fcd..05a0bb2b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,9 +1326,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
-      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
       echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
-      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini; \
+      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \
       php -m | grep -q 'phalcon' \
   ;fi
 

From 0d08d36bd3c2a315c8d3666a17ce6f3d88fd6990 Mon Sep 17 00:00:00 2001
From: Dawid Makowski <dawid.makowski@gmail.com>
Date: Thu, 13 Oct 2022 12:46:21 +0800
Subject: [PATCH 24/29] Adding artisan & art autocomplete in BASH

---
 workspace/aliases.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/workspace/aliases.sh b/workspace/aliases.sh
index 4bf0d572..9d756b2f 100644
--- a/workspace/aliases.sh
+++ b/workspace/aliases.sh
@@ -148,3 +148,14 @@ function fs() {
 		du $arg .[^.]* ./*;
 	fi;
 }
+
+# Add artisan autocomplete
+function _artisan()
+{
+	COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
+	COMMANDS=`php artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"`
+	COMPREPLY=(`compgen -W "$COMMANDS" -- "${COMP_WORDS[COMP_CWORD]}"`)
+	return 0
+}
+complete -F _artisan art
+complete -F _artisan artisan

From 045cd075b96dea90cd7d1f2b18904e695876c1c8 Mon Sep 17 00:00:00 2001
From: Silas de Rooy <silas@mailcamp.nl>
Date: Thu, 13 Oct 2022 12:53:56 +0200
Subject: [PATCH 25/29] add dnsutils extension to workspace asn php-fmp

---
 .env.example                                 |  2 ++
 DOCUMENTATION/content/documentation/index.md | 25 ++++++++++++++++++++
 DOCUMENTATION/content/introduction/index.md  |  1 +
 docker-compose.yml                           |  2 ++
 php-fpm/Dockerfile                           | 12 ++++++++++
 workspace/Dockerfile                         | 10 ++++++++
 6 files changed, 52 insertions(+)

diff --git a/.env.example b/.env.example
index fcf07853..9d9e0fe9 100644
--- a/.env.example
+++ b/.env.example
@@ -205,6 +205,7 @@ WORKSPACE_INSTALL_TRADER=false
 WORKSPACE_PROTOC_VERSION=latest
 WORKSPACE_INSTALL_MEMCACHED=true
 WORKSPACE_INSTALL_EVENT=false
+WORKSPACE_INSTALL_DNSUTILS=true
 
 ### PHP_FPM ###############################################
 
@@ -278,6 +279,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
diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 83ddacd3..2bf05578 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -2253,6 +2253,31 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
 <a name="Install-Oh-My-Zsh"></a>
 ## Install Oh My ZSH
 
+
+
+
+<br>
+<a name="Install-Dnsutils-Extension"></a>
+## Install Dnsutils extension
+
+1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers:
+<br>
+a) open the `.env` file
+<br>
+b) search for the `WORKSPACE_INSTALL_DNSUTILS` argument under the Workspace Container
+<br>
+c) set it to `true`
+<br>
+d) search for the `PHP_FPM_INSTALL_DNSUTILS` argument under the PHP-FPM Container
+<br>
+e) set it to `true`
+<br>
+
+2 - Re-build the containers `docker-compose build workspace php-fpm`
+
+
+
+
 > With the Laravel autocomplete plugin.
 
 [Zsh](https://en.wikipedia.org/wiki/Z_shell) is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.
diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index d1997b36..ad0f7c99 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -180,6 +180,7 @@ That's it! enjoy :)
          - `SOAP` 
          - `Drush` 
          - `Wordpress CLI`
+         - `dnsutils`
     - Apache ZooKeeper *(Centralized service for distributed systems to a hierarchical key-value store)*
     - Kibana *(Visualize your Elasticsearch data and navigate the Elastic Stack)*
     - Dejavu *(Edit your Elasticsearch data)*
diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..f99c3ac0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -174,6 +174,7 @@ services:
           - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
           - INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED}
           - INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
+          - INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -287,6 +288,7 @@ services:
           - PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
           - PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
           - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
+          - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
           - http_proxy
           - https_proxy
           - no_proxy
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..04a29552 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1270,6 +1270,18 @@ RUN set -eux; \
       php -m  | grep -q 'event' \
 ;fi
 
+###########################################################################
+# DNS utilities:
+###########################################################################
+
+USER root
+
+ARG INSTALL_DNSUTILS=false
+
+RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
+    apt-get update && apt-get install -y dnsutils \
+;fi
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..36c18385 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1773,7 +1773,17 @@ RUN set -eux; \
       php -m  | grep -q 'event' \
 ;fi
 
+###########################################################################
+# DNS utilities:
+###########################################################################
 
+USER root
+
+ARG INSTALL_DNSUTILS=false
+
+RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
+    apt-get update && apt-get install -y dnsutils \
+;fi
 
 #
 #--------------------------------------------------------------------------

From 71ae532527901e5e3a19d0dae3661a3078381471 Mon Sep 17 00:00:00 2001
From: Silas de Rooy <silas@mailcamp.nl>
Date: Thu, 13 Oct 2022 13:01:09 +0200
Subject: [PATCH 26/29] dnsutils is a package

---
 DOCUMENTATION/content/documentation/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 2bf05578..0ac99507 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -2257,7 +2257,7 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
 
 
 <br>
-<a name="Install-Dnsutils-Extension"></a>
+<a name="Install-Dnsutils"></a>
 ## Install Dnsutils extension
 
 1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers:

From b8501c0a2b2aa4caaaff0e562929bc9a1727f9e7 Mon Sep 17 00:00:00 2001
From: Silas de Rooy <silas@mailcamp.nl>
Date: Thu, 13 Oct 2022 13:02:40 +0200
Subject: [PATCH 27/29] removed extension word

---
 DOCUMENTATION/content/documentation/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 0ac99507..14b4d5ad 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -2258,7 +2258,7 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
 
 <br>
 <a name="Install-Dnsutils"></a>
-## Install Dnsutils extension
+## Install Dnsutils
 
 1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers:
 <br>

From 8f22b552ee00a550bd546b22b9ab326870056c0d Mon Sep 17 00:00:00 2001
From: Leonardo Medici <leonardo_medici@me.com>
Date: Fri, 29 Apr 2022 16:43:44 +0200
Subject: [PATCH 28/29] Fix Xdebug 3 compatibility with PHP 7.3 and 7.4

- Allow to set custom Xdebug port
- Update Xdebug to v3.1.4
---
 .env.example         | 1 +
 docker-compose.yml   | 4 ++--
 php-fpm/Dockerfile   | 7 ++++---
 workspace/Dockerfile | 7 ++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index fcf07853..63fec840 100644
--- a/.env.example
+++ b/.env.example
@@ -205,6 +205,7 @@ WORKSPACE_INSTALL_TRADER=false
 WORKSPACE_PROTOC_VERSION=latest
 WORKSPACE_INSTALL_MEMCACHED=true
 WORKSPACE_INSTALL_EVENT=false
+WORKSPACE_XDEBUG_PORT=9003
 
 ### PHP_FPM ###############################################
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..01704319 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -74,6 +74,7 @@ services:
           - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
           - INSTALL_GNUPG=${WORKSPACE_INSTALL_GNUPG}
           - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
+          - XDEBUG_PORT=${WORKSPACE_XDEBUG_PORT}
           - INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV}
           - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
@@ -218,6 +219,7 @@ services:
           - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
           - INSTALL_GNUPG=${PHP_FPM_INSTALL_GNUPG}
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
+          - XDEBUG_PORT=${PHP_FPM_XDEBUG_PORT}
           - INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
           - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
@@ -294,8 +296,6 @@ services:
         - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
         - docker-in-docker:/certs/client
-      ports:
-        - "${PHP_FPM_XDEBUG_PORT}:9003"
       expose:
         - "9000"
       extra_hosts:
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..5c4ac823 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -212,12 +212,13 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
 ###########################################################################
 
 ARG INSTALL_XDEBUG=false
+ARG XDEBUG_PORT=9003
 
 RUN if [ ${INSTALL_XDEBUG} = true ]; then \
   # Install the xdebug extension
   # https://xdebug.org/docs/compat
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
-    pecl install xdebug-3.1.2; \
+    pecl install xdebug-3.1.4; \
   else \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
       pecl install xdebug-2.5.5; \
@@ -235,10 +236,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 # Copy xdebug configuration for remote debugging
 COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
-RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
   sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /usr/local/etc/php/conf.d/xdebug.ini && \
   sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /usr/local/etc/php/conf.d/xdebug.ini && \
-  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=9003/" /usr/local/etc/php/conf.d/xdebug.ini && \
+  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /usr/local/etc/php/conf.d/xdebug.ini && \
   sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /usr/local/etc/php/conf.d/xdebug.ini && \
   sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /usr/local/etc/php/conf.d/xdebug.ini && \
   sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /usr/local/etc/php/conf.d/xdebug.ini && \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..d5042f66 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -327,13 +327,14 @@ RUN set -eux; \
 USER root
 
 ARG INSTALL_XDEBUG=false
+ARG XDEBUG_PORT=9003
 
 RUN if [ ${INSTALL_XDEBUG} = true ]; then \
   # Install the xdebug extension
   # https://xdebug.org/docs/compat
   apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
-    pecl install xdebug-3.1.2; \
+    pecl install xdebug-3.1.4; \
   else \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
       pecl install xdebug-2.5.5; \
@@ -351,10 +352,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 # ADD for REMOTE debugging
 COPY ./xdebug.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini
 
-RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
   sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
   sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
-  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=9003/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
+  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
   sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
   sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
   sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \

From b217f54d7aabd01a1ac4f4881be4989f7e7135a5 Mon Sep 17 00:00:00 2001
From: DanielFloris <daniel@klika.com.au>
Date: Mon, 31 Oct 2022 15:57:53 +1100
Subject: [PATCH 29/29] Adding pcov for php 8.x to php-fpm and workspace

---
 php-fpm/Dockerfile   |  8 +++-----
 workspace/Dockerfile | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index bed1b4c0..c3f9b120 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -260,11 +260,9 @@ USER root
 ARG INSTALL_PCOV=false
 
 RUN if [ ${INSTALL_PCOV} = true ]; then \
-  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
-    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
-      pecl install pcov && \
-      docker-php-ext-enable pcov \
-    ;fi \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
+    pecl install pcov && \
+    docker-php-ext-enable pcov \
   ;fi \
 ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index fda1e7d4..305a2a3b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -376,12 +376,10 @@ USER root
 ARG INSTALL_PCOV=false
 
 RUN if [ ${INSTALL_PCOV} = true ]; then \
-  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
-    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
-      pecl install pcov && \
-      echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
-      echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
-    ;fi \
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
+    pecl install pcov && \
+    echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
+    echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
   ;fi \
 ;fi