Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	docker-compose.yml

.env.example

@@ -122,6 +122,8 @@ WORKSPACE_INSTALL_NPM_GULP=true
 WORKSPACE_INSTALL_NPM_BOWER=false
 WORKSPACE_INSTALL_NPM_VUE_CLI=true
 WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
+WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI=false
+WORKSPACE_INSTALL_POPPLER_UTILS=false
 WORKSPACE_INSTALL_PHPREDIS=true
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_SUBVERSION=false
@@ -173,7 +175,7 @@ WORKSPACE_INSTALL_SWOOLE=false
 WORKSPACE_INSTALL_TAINT=false
 WORKSPACE_INSTALL_LIBPNG=false
 WORKSPACE_INSTALL_GRAPHVIZ=false
-WORKSPACE_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592
+WORKSPACE_INSTALL_IONCUBE=false # PHP 8.2 is not supported yet.
 WORKSPACE_INSTALL_MYSQL_CLIENT=false
 WORKSPACE_INSTALL_PING=false
 WORKSPACE_INSTALL_SSHPASS=false
@@ -183,6 +185,7 @@ WORKSPACE_INSTALL_YAML=false
 WORKSPACE_INSTALL_RDKAFKA=false
 WORKSPACE_INSTALL_MAILPARSE=false
 WORKSPACE_INSTALL_XMLRPC=false
+WORKSPACE_INSTALL_APCU=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_CHROME_DRIVER_VERSION=2.42
@@ -214,6 +217,7 @@ WORKSPACE_INSTALL_EVENT=false
 WORKSPACE_INSTALL_DNSUTILS=true
 WORKSPACE_XDEBUG_PORT=9000
 WORKSPACE_VITE_PORT=5173
+WORKSPACE_INSTALL_JDK=true
 
 ### PHP_FPM ###############################################
 
@@ -260,7 +264,7 @@ PHP_FPM_INSTALL_POSTGIS=false
 PHP_FPM_INSTALL_PCNTL=false
 PHP_FPM_INSTALL_CALENDAR=false
 PHP_FPM_INSTALL_FAKETIME=false
-PHP_FPM_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592
+PHP_FPM_INSTALL_IONCUBE=false # PHP 8.2 is not supported yet.
 PHP_FPM_INSTALL_RDKAFKA=false
 PHP_FPM_INSTALL_GETTEXT=false
 PHP_FPM_INSTALL_XMLRPC=false
@@ -274,7 +278,7 @@ PHP_FPM_INSTALL_PING=false
 PHP_FPM_INSTALL_SSHPASS=false
 PHP_FPM_INSTALL_MAILPARSE=false
 PHP_FPM_INSTALL_WKHTMLTOPDF=false
-PHP_FPM_KHTMLTOPDF_VERSION=0.12.6-1
+PHP_FPM_WKHTMLTOPDF_VERSION=0.12.6.1-3
 PHP_FPM_INSTALL_XLSWRITER=false
 PHP_FPM_INSTALL_PHPDECIMAL=false
 PHP_FPM_INSTALL_ZOOKEEPER=false
@@ -288,6 +292,7 @@ PHP_FPM_DEFAULT_LOCALE=POSIX
 PHP_FPM_XDEBUG_PORT=9000
 PHP_FPM_INSTALL_EVENT=false
 PHP_FPM_INSTALL_DNSUTILS=true
+PHP_FPM_INSTALL_POPPLER_UTILS=false
 
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
@@ -316,6 +321,7 @@ PHP_WORKER_INSTALL_MEMCACHED=false
 PHP_WORKER_INSTALL_OCI8=false
 PHP_WORKER_INSTALL_MSSQL=false
 PHP_WORKER_INSTALL_PHALCON=false
+PHP_WORKER_INSTALL_APCU=false
 PHP_WORKER_INSTALL_SOAP=false
 PHP_WORKER_INSTALL_ZIP_ARCHIVE=false
 PHP_WORKER_INSTALL_MYSQL_CLIENT=false
@@ -333,6 +339,7 @@ PHP_WORKER_INSTALL_XMLRPC=false
 PHP_WORKER_INSTALL_SSDB=false
 PHP_WORKER_INSTALL_EVENT=false
 PHP_WORKER_INSTALL_INTL=true
+PHP_WORKER_INSTALL_POPPLER_UTILS=false
 
 PHP_WORKER_PUID=1000
 PHP_WORKER_PGID=1000
@@ -374,6 +381,7 @@ LARAVEL_HORIZON_INSTALL_MONGO=false
 LARAVEL_HORIZON_INSTALL_CASSANDRA=false
 LARAVEL_HORIZON_INSTALL_FFMPEG=false
 LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false
+LARAVEL_HORIZON_INSTALL_POPPLER_UTILS=false
 LARAVEL_HORIZON_PGID=1000
 LARAVEL_HORIZON_PUID=1000
 
@@ -460,6 +468,7 @@ MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d
 ### POSTGRES ##############################################
 
 POSTGRES_VERSION=alpine
+POSTGRES_CLIENT_VERSION=15
 POSTGRES_DB=default
 POSTGRES_USER=default
 POSTGRES_PASSWORD=secret
@@ -1064,3 +1073,19 @@ SOKETI_METRICS_SERVER_PORT=9601
 ### ONEDEV ##################################################
 ONEDEV_HTTP_PORT=6610
 ONEDEV_SSH_PORT=6611
+
+### Keycloak ################################################
+KEYCLOAK_VERSION=latest
+KEYCLOAK_POSTGRES_INIT=true
+KEYCLOAK_HTTP_PORT=8081
+KEYCLOAK_CREATE_ADMIN_USER=true
+KEYCLOAK_ADMIN_USER='admin'
+KEYCLOAK_ADMIN_PASSWORD='secret'
+KEYCLOAK_POSTGRES_HOST=postgres
+KEYCLOAK_POSTGRES_USER=laradock_keycloak
+KEYCLOAK_POSTGRES_PASSWORD=laradock_keycloak
+KEYCLOAK_POSTGRES_DB=laradock_keycloak
+
+### Mailpit #################################################
+MAILPIT_HTTP_PORT=8125
+MAILPIT_SMTP_PORT=1125

.github/workflows/build-deploy-docs.yml

@@ -23,7 +23,7 @@ jobs:
         working-directory: ./DOCUMENTATION
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2

.github/workflows/main-ci.yml

@@ -22,10 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2" ]
+        php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2" ]
         service: [ php-fpm, php-worker, workspace ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build the Docker image
         env:
           PHP_VERSION: ${{ matrix.php_version }}
@@ -48,10 +48,10 @@ jobs:
           sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env
           sed -i -- 's/PG_CLIENT=true/PG_CLIENT=false/g' .env
           sed -i -- 's/MSSQL=true/MSSQL=false/g' .env
-          docker-compose build ${{ matrix.service }}
-          docker-compose up -d --no-deps -- ${{ matrix.service }}
-          docker-compose exec -T -- ${{ matrix.service }} php -m
-          docker-compose down
+          docker compose build ${{ matrix.service }}
+          docker compose up -d --no-deps -- ${{ matrix.service }}
+          docker compose exec -T -- ${{ matrix.service }} php -m
+          docker compose down
 
   build-other:
     # Don't trigger on schedule event when in a fork
@@ -62,10 +62,10 @@ jobs:
       matrix:
         service: [ 'nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build the Docker image
         run: |
           cp .env.example .env
           sed -i -- 's/=false/=true/g' .env
           sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
-          docker-compose build ${{ matrix.service }}
+          docker compose build ${{ matrix.service }}

DOCUMENTATION/content/documentation/index.md

@@ -1232,39 +1232,43 @@ A package ([Laravel RethinkDB](https://github.com/duxet/laravel-rethinkdb)) is b
 ## Use Minio
 
 1. Configure Minio:
-   - On the workspace container, change `INSTALL_MC` to true to get the client
-   - Set `MINIO_ACCESS_KEY` and `MINIO_ACCESS_SECRET` if you wish to set proper keys
+   - You can change some settings in the `.env` file (`MINIO_*`)
+   - You can install Minio Client on the workspace container: `WORKSPACE_INSTALL_MC=true`
+
 2. Run the Minio Container (`minio`) with the `docker-compose up` command. Example:
     ```bash
     docker-compose up -d minio
     ```
+
 3. Open your browser and visit the localhost on port **9000** at the following URL:  `http://localhost:9000`
-4. Create a bucket either through the webui or using the mc client:
+4. Create a bucket either through the webui or using the Minio Client:
     ```bash
     mc mb minio/bucket
     ```
-5 - When configuring your other clients use the following details:
-  ```
-  AWS_URL=http://minio:9000
-  AWS_ACCESS_KEY_ID=access
-  AWS_SECRET_ACCESS_KEY=secretkey
-  AWS_DEFAULT_REGION=us-east-1
-  AWS_BUCKET=test
-  AWS_PATH_STYLE=true
-  ```
-6 - In `filesystems.php` you shoud use the following details (s3):
-  ```
-'s3' => [
-            'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION'),
-            'bucket' => env('AWS_BUCKET'),
-            'endpoint' => env('AWS_URL'),
-            'use_path_style_endpoint' => env('AWS_PATH_STYLE', false)
-        ],
-```
-`'AWS_PATH_STYLE'` shout set to true only for local purpouse 
+5. When configuring your other clients use the following details:
+    ```
+    AWS_URL=http://minio:9000
+    AWS_ACCESS_KEY_ID=access
+    AWS_SECRET_ACCESS_KEY=secretkey
+    AWS_DEFAULT_REGION=us-east-1
+    AWS_BUCKET=test
+    AWS_USE_PATH_STYLE_ENDPOINT=true
+    ```
+
+6. In `filesystems.php` you should use the following details (s3):
+    ```php
+    's3' => [
+        'driver' => 's3',
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION'),
+        'bucket' => env('AWS_BUCKET'),
+        'endpoint' => env('AWS_URL'),
+        'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false)
+    ],
+    ```
+   
+`AWS_USE_PATH_STYLE_ENDPOINT` should set to true only for local purpose 
 
 
 
@@ -1490,6 +1494,46 @@ docker-compose exec tarantool console
 7 - There you can operate with tarantool database ([official documentation](https://www.tarantool.io/en/doc/latest/) can be helpful).
 
 
+<br>
+<a name="use Keycloak"></a>
+## Use Keycloak
+
+1. Run the Keycloak Container (`keycloak`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d keycloak
+```
+
+2. Open your browser and visit the localhost on port 8081:  `http://localhost:8081`
+
+3. Login with the following credentials:
+
+    - Username: `admin`
+    - Password: `secret`
+
+
+<br>
+<a name="use Mailpit"></a>
+## Use Mailpit
+
+1. Run the Mailpit Container (`mailpit`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d mailpit
+```
+
+2. Open your browser and visit the localhost on port 8125:  `http://localhost:8125`
+3. Setup config in your Laravel project’s .env file
+```text
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1125
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+```
+
+
+
 <br>
 <a name="CodeIgniter"></a>
 
@@ -1606,7 +1650,7 @@ Update the locale setting, default is `POSIX`
 <a name="CronJobs"></a>
 ## Adding cron jobs
 
-You can add your cron jobs to `workspace/crontab/root` after the `php artisan` line.
+You can add your cron jobs to `workspace/crontab/laradock` after the `php artisan` line.
 
 ```
 * * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1
@@ -1941,6 +1985,55 @@ To install NPM ANGULAR CLI in the Workspace container
 3 - Re-build the container `docker-compose build workspace`
 
 
+<br>
+<a name="Install-npm-check-updates"></a>
+## Install npm-check-updates CLI
+
+To install npm-check-updates CLI [here](https://www.npmjs.com/package/npm-check-updates) in the Workspace container
+
+1 - Open the `.env` file
+
+2 - Make sure Node is also being installed (`WORKSPACE_INSTALL_NODE` set to `true`)
+
+3 - Search for the `WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI` argument under the Workspace Container and set it to `true`
+
+4 - Re-build the container `docker-compose build workspace`
+
+<br>
+<a name="Install-poppler-utils"></a>
+## Install `poppler-utils` (and `antiword` combined)
+
+Poppler is a PDF rendering library based on Xpdf PDF viewer.
+
+This package contains command line utilities (based on Poppler) for getting information of PDF documents, convert them to other formats, or manipulate them:
+* pdfdetach -- lists or extracts embedded files (attachments)
+* pdffonts -- font analyzer
+* pdfimages -- image extractor
+* pdfinfo -- document information
+* pdfseparate -- page extraction tool
+* pdfsig -- verifies digital signatures
+* pdftocairo -- PDF to PNG/JPEG/PDF/PS/EPS/SVG converter using Cairo
+* pdftohtml -- PDF to HTML converter
+* pdftoppm -- PDF to PPM/PNG/JPEG image converter
+* pdftops -- PDF to PostScript (PS) converter
+* pdftotext -- text extraction
+* pdfunite -- document merging tool
+
+`poppler-utils` is often used by popular PDF/DOC parsing packages in combination with `antiword`, hence both are installed when flags in `.env` are set.
+
+To install `poppler-utils` [(more here)](https://packages.debian.org/sid/poppler-utils) in any of the `workspace/php-fpm/php-worker/laravel-horizon` container
+
+1 - Open the `.env` file
+
+2 - Search for the `WORKSPACE_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
+
+3 - Search for the `PHP_FPM_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
+
+4 - Search for the `PHP_WORKER_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
+
+5 - Search for the `LARAVEL_HORIZON_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
+
+6 - Re-build the container `docker-compose build workspace php-fpm php-worker laravel-horizon`
 
 
 
@@ -2525,6 +2618,13 @@ docker-compose up ...
 *Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.*
 
 
+<br>
+<a name="ca-certificates"></a>
+## ca-certificates
+
+To install your own CA certificates, you can add them to the `workspace/ca-certificates` folder.
+This way the certificates will be installed into the system ca store of the workspace container.
+
 
 <br>
 <a name="upgrade-laradock"></a>

DOCUMENTATION/content/getting-started/index.md

@@ -7,7 +7,7 @@ weight: 2
 ## Requirements
 
 - [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/) [ >= 17.12 ]
+- [Docker](https://www.docker.com/products/docker-desktop/) [ >= 19.03.0 ]
 
 
 
@@ -148,12 +148,12 @@ If you use Chrome 63 or above for development, don't use `.dev`. [Why?](https://
 
 If you are using **Docker Toolbox** (VM), do one of the following:
 
-- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
+- Upgrade to [Docker Desktop](https://www.docker.com/products/docker-desktop/) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
 - Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/LaraDock-ToolBox) branch. *(outdated)*
 
 <br>
 
-We recommend using a Docker version which is newer than 1.13. 
+We recommend using a Docker Engine version which is newer than 19.03.0.
 
 <br>
 
@@ -184,7 +184,7 @@ docker-compose up -d nginx mysql
 **Note**: All the web server containers `nginx`, `apache` ..etc depends on `php-fpm`, which means if you run any of them, they will automatically launch the `php-fpm` container for you, so no need to explicitly specify it in the `up` command. If you have to do so, you may need to run them as follows: `docker-compose up -d nginx php-fpm mysql`.
 
 
-You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images).
+You can select your own combination of containers from [this list](https://laradock.io/introduction/#supported-software-docker-images).
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*