Merge pull request #26 from Faks/dev

Dev

Author: Faks

.env.example

@@ -38,8 +38,8 @@ COMPOSE_PROJECT_NAME=laradock
 ### PHP Version ###########################################
 
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
-# Accepted values: 8.4 - 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
-PHP_VERSION=8.3
+# Accepted values: 8.5 - 8.4 - 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
+PHP_VERSION=8.4
 
 ### Phalcon Version ###########################################
 
@@ -108,6 +108,7 @@ SHELL_OH_MY_ZSH_ALIASES=false
 ### WORKSPACE #############################################
 
 WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest
+WORKSPACE_ALLOW_RELEASE_INFO_CHANGE=false
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
 WORKSPACE_COMPOSER_VERSION=2
 WORKSPACE_COMPOSER_AUTH_JSON=false
@@ -199,7 +200,7 @@ WORKSPACE_SSH_PORT=2222
 WORKSPACE_INSTALL_FFMPEG=false
 WORKSPACE_INSTALL_AUDIOWAVEFORM=false
 WORKSPACE_INSTALL_WKHTMLTOPDF=false
-WORKSPACE_WKHTMLTOPDF_VERSION=0.12.6-1
+WORKSPACE_WKHTMLTOPDF_VERSION=0.12.6.1-3
 WORKSPACE_INSTALL_GNU_PARALLEL=false
 WORKSPACE_INSTALL_AST=true
 WORKSPACE_AST_VERSION=1.0.10
@@ -299,6 +300,7 @@ PHP_FPM_XDEBUG_PORT=9000
 PHP_FPM_INSTALL_EVENT=false
 PHP_FPM_INSTALL_DNSUTILS=true
 PHP_FPM_INSTALL_POPPLER_UTILS=false
+PHP_FPM_INSTALL_GRAPHVIZ=false
 
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
@@ -346,6 +348,7 @@ PHP_WORKER_INSTALL_SSDB=false
 PHP_WORKER_INSTALL_EVENT=false
 PHP_WORKER_INSTALL_INTL=true
 PHP_WORKER_INSTALL_POPPLER_UTILS=false
+PHP_WORKER_INSTALL_GRAPHVIZ=false
 
 PHP_WORKER_PUID=1000
 PHP_WORKER_PGID=1000
@@ -494,8 +497,8 @@ MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d
 
 ### POSTGRES ##############################################
 
-POSTGRES_VERSION=alpine
-POSTGRES_CLIENT_VERSION=15
+POSTGRES_VERSION=18-3.6-alpine
+POSTGRES_CLIENT_VERSION=17
 POSTGRES_DB=default
 POSTGRES_USER=default
 POSTGRES_PASSWORD=secret

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

@@ -15,7 +15,7 @@ jobs:
       contents: write # to push pages branch (peaceiris/actions-gh-pages)
 
     if: github.repository == 'laradock/laradock'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
     defaults:

.github/workflows/main-ci.yml

@@ -22,10 +22,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+        php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]
         service: [ php-fpm, php-worker, workspace ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v3
       - name: Build the Docker image
         env:
           PHP_VERSION: ${{ matrix.php_version }}
@@ -42,16 +43,14 @@ jobs:
           sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
           sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
           sed -i -- 's/OCI8=true/OCI8=false/g' .env
+          sed -i -- 's/PYTHON=true/PYTHON=false/g' .env
           sed -i -- 's/V8JS=true/V8JS=false/g' .env
           sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env
           sed -i -- 's/SSDB=true/SSDB=false/g' .env
           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 buildx bake ${{ matrix.service }} --progress=plain --set *.output=type=cacheonly
 
   build-other:
     # Don't trigger on schedule event when in a fork
@@ -62,10 +61,11 @@ jobs:
       matrix:
         service: [ 'nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo' ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v3
       - 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 buildx bake ${{ matrix.service }} --progress=plain --set *.output=type=cacheonly

DOCUMENTATION/docs/usage.md

@@ -2376,34 +2376,58 @@ A bash prompt that displays information about the current git repository. In par
 **Note** You can configure bash-git-prompt by editing the `workspace/gitprompt.sh` file and re-building the workspace container.
 For configuration information, visit the [bash-git-prompt repository](https://github.com/magicmonty/bash-git-prompt).
 
-<br/>
-<a name="Install-Oh-My-Zsh"></a>
-## Install Oh My ZSH
-
-
-
 
 <br/>
 <a name="Install-Dnsutils"></a>
 ## Install Dnsutils
 
 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`
 
 
+<br/>
+<a name="Install-GRAPHVIZ"></a>
+## Install GRAPHVIZ
+
+To install [GRAPHVIZ](https://graphviz.org/)
+
+First, open the `.env` file
+
+> For the workspace container :
+
+- Search for the `WORKSPACE_INSTALL_GRAPHVIZ` argument under the Workspace Container and set it to `true`
+
+- Re-build the container `docker-compose build workspace`
+
+> For the php-fpm container (probably what you're looking for) :
+
+- Search for the `PHP_FPM_INSTALL_GRAPHVIZ` argument under the PHP-Fpm Container and set it to `true`
+
+- Re-build the container `docker-compose build php-fpm`
 
+> For the php-worker container :
+
+- Search for the `PHP_WORKER_INSTALL_GRAPHVIZ` argument under the PHP-Worker Container and set it to `true`
+
+- Re-build the container `docker-compose build php-worker`
+
+
+
+<br/>
+<a name="Install-Oh-My-Zsh"></a>
+## Install Oh My ZSH
 
 > With the Laravel autocomplete plugin.
 

DOCUMENTATION/docusaurus.config.ts

@@ -4,7 +4,7 @@ import type * as Preset from '@docusaurus/preset-classic';
 
 const config: Config = {
   title: 'Laradock',
-  tagline: 'Full PHP development environment on Docker.',
+  tagline: 'A Docker setup that lets you run a full PHP development environment in seconds.',
   favicon: 'laradock.ico',
 
   // Set the production url of your site here
@@ -123,7 +123,7 @@ const config: Config = {
         //   ],
         // },
       ],
-      copyright: `Copyright © 2016 - ${new Date().getFullYear()} - Laradock - By <a href="https://zalt.me" target="_blank" rel="noopener noreferrer">Mahmoud Zalt</a>.`,
+      copyright: `Copyright © 2015 - ${new Date().getFullYear()} - Laradock - By <a href="https://zalt.me" target="_blank" rel="noopener noreferrer">Mahmoud Zalt</a>.`,
     },
     prism: {
       theme: prismThemes.github,

DOCUMENTATION/package.json

@@ -15,10 +15,10 @@
     "typecheck": "tsc"
   },
   "dependencies": {
+    "@sista/ai-assistant-react": "^3.3.21",
     "@docusaurus/core": "3.3.0",
     "@docusaurus/preset-classic": "3.3.0",
     "@mdx-js/react": "^3.0.0",
-    "@sista/ai-assistant-react": "^2.2.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
     "react": "^18.0.0",

DOCUMENTATION/src/components/AiAssistant/index.tsx

@@ -10,11 +10,11 @@ type SponsorItem = {
 
 const SponsorList: SponsorItem[] = [
   {
-    link: "https://smart.sista.ai/?utm_source=docs_laradock&utm_medium=sponsor&utm_campaign=landing_page_welcome",
+    link: "https://smart.sista.ai/?utm_source=laradock&utm_medium=sponsor_banner&utm_campaign=landing_page",
     imageUrl: "/img/sponsors/sista-ai-logo.png",
     description: (
       <>
-        <b>Make Your Apps Smarter with a Plug-and-Play AI Voice Assistant.</b>
+        <b>Plug-and-Play <a href="https://smart.sista.ai/?utm_source=laradock&utm_medium=sponsor_banner&utm_campaign=landing_page" target="_blank" style={{ color: '#8098f8' }}>AI Agents</a> for Apps & Websites</b>
       </>
     ),
   },
@@ -25,12 +25,25 @@ function Sponsor({ link, imageUrl, description }: SponsorItem) {
     <div className={clsx("col col--12")}>
       <div className="text--center">
         <a href={link} target="_blank" rel="noopener noreferrer">
-          <img src={imageUrl} className={sponsorsStyles.sponsorImg} role="img" />
+          <img 
+            src={imageUrl} 
+            className={sponsorsStyles.sponsorImg} 
+            role="img"
+            style={{ 
+              maxWidth: '100%',
+              minWidth: '350px',
+              height: 'auto'
+            }} 
+          />
         </a>
       </div>
       <div className="text--center padding-horiz--md">
 
-        <p>{description}</p>
+        <p style={{ 
+          fontSize: 'clamp(1rem, 2vw, 1.2em)',
+          lineHeight: 1.5,
+          margin: '1rem 0'
+        }}>{description}</p>
       </div>
     </div>
   );

DOCUMENTATION/src/components/SponsorsPage/index.tsx

@@ -4,7 +4,10 @@ import styles from './styles.module.css';
 export default function WelcomePage() {
   return (
     <section className={styles.welcome}>
-      <h1>Fully Dockerized PHP Environment, Ready to Go!</h1>
+      <div className={styles.heroContent}>
+        <h1>Full PHP Dev Environment For Docker</h1>
+      </div>
+      <div className={styles.overlay} />
     </section>
   );
 }