From bbf8acef3c7b22f92d5a793437842da31b5e1dcc Mon Sep 17 00:00:00 2001
From: Tim Basten <tbasten@gmail.com>
Date: Fri, 6 Mar 2026 01:11:27 +0000
Subject: [PATCH] Consolidate Docker Compose into single compose.yaml

Merge openldap service from docker-compose.yml into compose.yaml
and remove the duplicate file to fix the Docker Compose warning
about multiple config files.
---
 compose.yaml       |  38 ++++++++++++++
 docker-compose.yml | 125 ---------------------------------------------
 2 files changed, 38 insertions(+), 125 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/compose.yaml b/compose.yaml
index af5042d..adbaf90 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -26,6 +26,7 @@ services:
             - redis
             - selenium
             - mailpit
+            - openldap
     mysql:
         image: 'mysql:8.4'
         ports:
@@ -81,6 +82,39 @@ services:
             - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025'
         networks:
             - sail
+    openldap:
+        image: 'osixia/openldap:1.5.0'
+        ports:
+            - '${FORWARD_LDAP_PORT:-389}:389'
+            - '${FORWARD_LDAPS_PORT:-636}:636'
+        environment:
+            LDAP_ORGANISATION: '${LDAP_ORGANISATION:-Travel App}'
+            LDAP_DOMAIN: '${LDAP_DOMAIN:-travel.local}'
+            LDAP_ADMIN_PASSWORD: '${LDAP_ADMIN_PASSWORD:-adminpassword}'
+            LDAP_CONFIG_PASSWORD: '${LDAP_CONFIG_PASSWORD:-configpassword}'
+            LDAP_READONLY_USER: 'true'
+            LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}'
+            LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}'
+        volumes:
+            - 'sail-ldap-data:/var/lib/ldap'
+            - 'sail-ldap-config:/etc/ldap/slapd.d'
+        networks:
+            - sail
+        healthcheck:
+            test:
+                - CMD
+                - ldapsearch
+                - '-x'
+                - '-H'
+                - 'ldap://localhost'
+                - '-b'
+                - 'dc=travel,dc=local'
+                - '-D'
+                - 'cn=admin,dc=travel,dc=local'
+                - '-w'
+                - '${LDAP_ADMIN_PASSWORD:-adminpassword}'
+            retries: 3
+            timeout: 5s
 networks:
     sail:
         driver: bridge
@@ -89,3 +123,7 @@ volumes:
         driver: local
     sail-redis:
         driver: local
+    sail-ldap-data:
+        driver: local
+    sail-ldap-config:
+        driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 409c3f4..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-services:
-    laravel.test:
-        build:
-            context: ./vendor/laravel/sail/runtimes/8.4
-            dockerfile: Dockerfile
-            args:
-                WWWGROUP: '${WWWGROUP}'
-        image: sail-8.4/app
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
-        ports:
-            - '${APP_PORT:-80}:80'
-            - '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
-        environment:
-            WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
-            XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
-            XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
-            IGNITION_LOCAL_SITES_PATH: '${PWD}'
-        volumes:
-            - '.:/var/www/html'
-        networks:
-            - sail
-        depends_on:
-            - mysql
-            - redis
-            - mailpit
-            - openldap
-
-    mysql:
-        image: 'mysql/mysql-server:8.0'
-        ports:
-            - '${FORWARD_DB_PORT:-3306}:3306'
-        environment:
-            MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ROOT_HOST: '%'
-            MYSQL_DATABASE: '${DB_DATABASE}'
-            MYSQL_USER: '${DB_USERNAME}'
-            MYSQL_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ALLOW_EMPTY_PASSWORD: 1
-        volumes:
-            - 'sail-mysql:/var/lib/mysql'
-            - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
-        networks:
-            - sail
-        healthcheck:
-            test:
-                - CMD
-                - mysqladmin
-                - ping
-                - '-p${DB_PASSWORD}'
-            retries: 3
-            timeout: 5s
-
-    redis:
-        image: 'redis:alpine'
-        ports:
-            - '${FORWARD_REDIS_PORT:-6379}:6379'
-        volumes:
-            - 'sail-redis:/data'
-        networks:
-            - sail
-        healthcheck:
-            test:
-                - CMD
-                - redis-cli
-                - ping
-            retries: 3
-            timeout: 5s
-
-    mailpit:
-        image: 'axllent/mailpit:latest'
-        ports:
-            - '${FORWARD_MAILPIT_PORT:-1025}:1025'
-            - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025'
-        networks:
-            - sail
-
-    openldap:
-        image: 'osixia/openldap:1.5.0'
-        ports:
-            - '${FORWARD_LDAP_PORT:-389}:389'
-            - '${FORWARD_LDAPS_PORT:-636}:636'
-        environment:
-            LDAP_ORGANISATION: '${LDAP_ORGANISATION:-Travel App}'
-            LDAP_DOMAIN: '${LDAP_DOMAIN:-travel.local}'
-            LDAP_ADMIN_PASSWORD: '${LDAP_ADMIN_PASSWORD:-adminpassword}'
-            LDAP_CONFIG_PASSWORD: '${LDAP_CONFIG_PASSWORD:-configpassword}'
-            LDAP_READONLY_USER: 'true'
-            LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}'
-            LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}'
-        volumes:
-            - 'sail-ldap-data:/var/lib/ldap'
-            - 'sail-ldap-config:/etc/ldap/slapd.d'
-        networks:
-            - sail
-        healthcheck:
-            test:
-                - CMD
-                - ldapsearch
-                - '-x'
-                - '-H'
-                - 'ldap://localhost'
-                - '-b'
-                - 'dc=travel,dc=local'
-                - '-D'
-                - 'cn=admin,dc=travel,dc=local'
-                - '-w'
-                - '${LDAP_ADMIN_PASSWORD:-adminpassword}'
-            retries: 3
-            timeout: 5s
-
-networks:
-    sail:
-        driver: bridge
-
-volumes:
-    sail-mysql:
-        driver: local
-    sail-redis:
-        driver: local
-    sail-ldap-data:
-        driver: local
-    sail-ldap-config:
-        driver: local