From 042411ab10cdda31bfb9a76ce7fbcdaec56c98f5 Mon Sep 17 00:00:00 2001
From: felixboehm <kontakt@felixboehm.it>
Date: Wed, 7 Oct 2020 16:07:31 +0200
Subject: [PATCH] Start the ldap server from the entrypoint

---
 ocis/docker/eos-ocis-dev/README.md  | 8 +-------
 ocis/docker/eos-ocis-dev/entrypoint | 2 ++
 ocis/docker/eos-ocis-dev/start-ldap | 3 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ocis/docker/eos-ocis-dev/README.md b/ocis/docker/eos-ocis-dev/README.md
index 69bc688304..4e029100bd 100644
--- a/ocis/docker/eos-ocis-dev/README.md
+++ b/ocis/docker/eos-ocis-dev/README.md
@@ -53,13 +53,7 @@ docker-compose exec ocis ./bin/ocis list
 docker-compose up -d
 ```
 
-2. Start the ldap authentication
-
-```
-docker-compose exec -d ocis /start-ldap
-```
-
-3. Configure to use eos storage driver instead of default storage driver
+2. Configure to use eos storage driver instead of default storage driver
 
 - kill the home storage and data providers. we need to switch them to the eoshome driver:
 
diff --git a/ocis/docker/eos-ocis-dev/entrypoint b/ocis/docker/eos-ocis-dev/entrypoint
index 88e02157b3..35d46f347b 100755
--- a/ocis/docker/eos-ocis-dev/entrypoint
+++ b/ocis/docker/eos-ocis-dev/entrypoint
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 make build
+/start-ldap &
+
 exec bin/ocis server
\ No newline at end of file
diff --git a/ocis/docker/eos-ocis-dev/start-ldap b/ocis/docker/eos-ocis-dev/start-ldap
index 6d8d30768a..64a5df0e68 100755
--- a/ocis/docker/eos-ocis-dev/start-ldap
+++ b/ocis/docker/eos-ocis-dev/start-ldap
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+LDAP_BINDDN=${LDAP_BINDDN:-cn=reva,ou=sysusers,dc=example,dc=org}
+LDAP_BINDPW=${LDAP_BINDPW:-reva}
+
 echo "Waiting for EOS MGM"
 echo "until nc -z -w 3 $EOS_MGM_ALIAS 1094; do sleep 2; done;" > /wait-for-mgm
 chmod +x /wait-for-mgm