mystiq/dex
Archived
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve script logging

Browse source 
Signed-off-by: Martin Heide <martin.heide@faro.com>
This commit is contained in:
Martin Heide 2020-07-13 15:40:56 +00:00
parent ce337661b9
commit b4d22bf1b2
1 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
scripts/slapd.sh
View file

@ -10,41 +10,47 @@
set -eu set -eu
cd -- "$(dirname "$0")/.." cd -- "$(dirname "$0")/.."
run_cmd() {
echo ">" "$@" >&2
"$@"
}
keep_running= keep_running=
if [ $# -gt 0 ] && [ "$1" = "--keep" ]; then if [ $# -gt 0 ] && [ "$1" = "--keep" ]; then
keep_running=1 keep_running=1
fi fi
if [ -z "$keep_running" ] || [ "$(docker inspect --format="{{.State.Running}}" ldap 2> /dev/null)" != "true" ]; then if [ -z "$keep_running" ] || [ "$(docker inspect --format="{{.State.Running}}" ldap 2> /dev/null)" != "true" ]; then
echo "LDAP container not running, or running and --keep not specified." echo "LDAP container not running, or running and --keep not specified."
echo "Removing old LDAP container (if any)..." echo "Removing old LDAP container (if any)..."
docker rm --force ldap || true run_cmd docker rm --force ldap || true
echo "Starting LDAP container..." echo "Starting LDAP container..."
# Currently the most popular OpenLDAP image on Docker Hub. Comes with the latest version OpenLDAP 2.4.50. # Currently the most popular OpenLDAP image on Docker Hub. Comes with the latest version OpenLDAP 2.4.50.
docker run -p 389:389 -p 636:636 -v $PWD:$PWD --name ldap --detach osixia/openldap:1.4.0 run_cmd docker run -p 389:389 -p 636:636 -v $PWD:$PWD --name ldap --detach osixia/openldap:1.4.0
tries=1 tries=1
max_tries=10 max_tries=10
echo "Waiting for LDAP container ($tries/$max_tries)..." echo "Waiting for LDAP container ($tries/$max_tries)..."
# Wait until expected line "structuralObjectClass: organization" shows up. # Wait until expected line "structuralObjectClass: organization" shows up.
# Seems to work more reliably than waiting for exit code 0. That would be: # Seems to work more reliably than waiting for exit code 0. That would be:
# while ! docker exec ldap slapcat -b "dc=example,dc=org" > /dev/null 2>&1; do # while ! docker exec ldap slapcat -b "dc=example,dc=org" > /dev/null 2>&1; do
while [[ ! "$(docker exec ldap slapcat -b "dc=example,dc=org" 2>/dev/null)" =~ organization ]]; do while [[ ! "$(docker exec ldap slapcat -b "dc=example,dc=org" 2>/dev/null)" =~ organization ]]; do
((++tries)) ((++tries))
if [ "$tries" -gt "$max_tries" ]; then if [ "$tries" -gt "$max_tries" ]; then
echo "ERROR: Timeout waiting for LDAP container." echo "ERROR: Timeout waiting for LDAP container."
exit 1 exit 1
fi fi
sleep 1 sleep 1
echo "Waiting for LDAP container ($tries/$max_tries)..." echo "Waiting for LDAP container ($tries/$max_tries)..."
done done
fi fi
echo "Adding example entries to directory..." echo "Adding example entries to directory..."
set -x run_cmd docker exec ldap ldapadd \
docker exec ldap ldapadd \ -x \
-x \ -D "cn=admin,dc=example,dc=org" \
-D "cn=admin,dc=example,dc=org" \ -w admin \
-w admin \ -H ldap://localhost:389/ \
-H ldap://localhost:389/ \ -f $PWD/examples/config-ldap.ldif
-f $PWD/examples/config-ldap.ldif
echo "OK."