Merge branch 'laradock:master' into master

wangdeer · Jul 2, 2024 · f9d9ca9 · f9d9ca9
2 parents babbe17 + 5051303
commit f9d9ca9
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 124 deletions.
diff --git a/.env.example b/.env.example
@@ -223,6 +223,7 @@ WORKSPACE_INSTALL_DNSUTILS=true
 WORKSPACE_XDEBUG_PORT=9000
 WORKSPACE_VITE_PORT=5173
 WORKSPACE_INSTALL_JDK=true
+WORKSPACE_INSTALL_GITHUB_CLI=false
 
 ### PHP_FPM ###############################################
 
@@ -1072,6 +1073,8 @@ NATS_MONITORING_PORT=6222
 NATS_ROUTE_PORT=8222
 
 ### SOKETI ##################################################
+SOKETI_NODE_VERSION=16-debian
+SOKETI_BASE_IMAGE_TAG_PREFIX=latest
 SOKETI_PORT=6001
 SOKETI_METRICS_SERVER_PORT=9601
 

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
@@ -382,6 +382,41 @@ WORKSPACE_INSTALL_PHPDBG=true
 PHP_FPM_INSTALL_PHPDBG=true
 ```
 
+<br>
+<a name="Install-github-copilot-cli"></a>
+## Install Github Copilot Cli
+### Note: You must have Github Copilot access to use this feature.
+Install `gh-cli` in the Workspace Container:
+
+<br>
+1 - Open the `.env`.
+
+2 - Search for `WORKSPACE_INSTALL_GITHUB_CLI`.
+
+3 - Set value to `true`
+
+```dotenv
+WORKSPACE_INSTALL_GITHUB_CLI=true
+```
+4 - Re-build the containers `docker compose build workspace`
+
+5 - start your container `docker compose up -d workspace // ..and all your other containers`
+
+6 - Enter the Workspace container:
+```bash
+docker-compose exec workspace bash
+```
+
+7 - Authenticate with your github account and follow the instructions::
+```bash
+gh auth login
+```
+
+8 - Install the copilot cli:
+```bash
+ gh extension install github/gh-copilot
+```
+
 
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -179,6 +179,7 @@ services:
           - INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
           - INSTALL_POPPLER_UTILS=${WORKSPACE_INSTALL_POPPLER_UTILS}
           - INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
+          - INSTALL_GITHUB_CLI=${WORKSPACE_INSTALL_GITHUB_CLI}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -668,6 +669,7 @@ services:
           - CHANGE_SOURCE=${CHANGE_SOURCE}
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - PHALCON_VERSION=${PHALCON_VERSION}
+          - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2}
           - INSTALL_GD=${PHP_WORKER_INSTALL_GD}
           - INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK}
@@ -755,6 +757,9 @@ services:
     soketi:
       build:
         context: ./soketi
+        args:
+          - NODE_VERSION=${SOKETI_NODE_VERSION}
+          - BASE_IMAGE_TAG_PREFIX=${SOKETI_BASE_IMAGE_TAG_PREFIX}
       volumes:
         - ./soketi/config.json:/app/bin/config.json:ro
       ports:

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -15,4 +15,10 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 RUN chmod 0444 /etc/mysql/conf.d/my.cnf
 
+RUN if [ ${MYSQL_VERSION} > '8.4.0-0.000' ]; then \
+  echo 'mysql_native_password=on' >> /etc/mysql/conf.d/my.cnf \
+else \
+  echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf \
+;fi
+
 EXPOSE 3306
diff --git a/mysql/my.cnf b/mysql/my.cnf
@@ -8,5 +8,4 @@
 [mysqld]
 sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
 character-set-server=utf8
-default-authentication-plugin=mysql_native_password
 innodb_use_native_aio=0
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -667,13 +667,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
 ARG INSTALL_IONCUBE=false
 
 RUN if [ ${INSTALL_IONCUBE} = true ]; then \
-    if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "7.4" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "7.3" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "7.2" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "7.1" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "7.0" ] \
-      || [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \
+    if [ ${LARADOCK_PHP_VERSION} != "8.3" ] \
+      && [ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
       # Install the php ioncube loader
       curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
       && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \

diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
@@ -348,11 +348,11 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-RUN if [ $INSTALL_PHALCON = true ]; then \
-      apt-get update -yqq \
+RUN if [ "$INSTALL_PHALCON" = true ]; then \
+      apk update \
       && pecl channel-update pecl.php.net \
-      && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      && apk add --no-cache libpcre32 \
+      && pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
       docker-php-ext-enable phalcon; \
       php -m | grep -q 'phalcon' \
     ;fi