From ce9a1d27d1558c11181ddc44bba3074749913f36 Mon Sep 17 00:00:00 2001
From: Guillaume Lakano <guillaume-github@lakano.org>
Date: Mon, 21 Aug 2023 17:27:11 +0200
Subject: [PATCH] =?UTF-8?q?Remove=20the=20deprecated=20Docker=20=C2=AB=20l?=
 =?UTF-8?q?inks=20=C2=BB=20statement=20for=20phpmyadmin/phpldapadmin=20(#4?=
 =?UTF-8?q?83)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove the deprecated Docker « links » statement for phpmyadmin/phpldapadmin

* Adjust the LDAP host env value

* Configuration of env value for Local LDAP

---------

Co-authored-by: guillaume <guillaume@nox.digital>
---
 docker-compose-dev.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 21e57a4c0..9909ad7ce 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -44,8 +44,6 @@ services:
         - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025'
     phpmyadmin:
       image: phpmyadmin/phpmyadmin
-      links:
-        - db:db
       ports:
         - '${FORWARD_PHPMYADMIN_PORT:-8080}:80'
       environment:
@@ -66,12 +64,10 @@ services:
       command: --copy-service
     phpldapadmin:
       image: osixia/phpldapadmin
-      links:
-        - openldap:ldap-host
       ports:
         - '${FORWARD_PHPLDAPADMIN_PORT:-6680}:80'
       environment:
-        PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'ldap-host': [{'server': []},{'login': [{'bind_id': 'cn=admin,dc=university,dc=org', 'bind_pass': 'admin'}]}]}]"
+        PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'Local LDAP': [{'server': [{'host': 'openldap'}]},{'login': [{'bind_id': 'cn=admin,dc=university,dc=org'},{'bind_pass': 'admin'},{'auth_type': 'config'}]}]}]"
         PHPLDAPADMIN_HTTPS: 'false'
 volumes:
   mariadb: