public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-19 11:08:09 +02:00
Code Issues Projects Releases Wiki Activity

[bitnami/openldap] Fix timing issue where openldap is not yet ready (#22112)

Browse Source 
* Fix timing issue where openldap is not yet ready

Signed-off-by: tatankat <tatankat@users.noreply.github.com>

* Rename is_ldap_answering to is_ldap_ready and doc cleanup

Signed-off-by: tatankat <tatankat@users.noreply.github.com>

* Skip SC2015 as this works as intended

Signed-off-by: tatankat <tatankat@users.noreply.github.com>

---------

Signed-off-by: tatankat <tatankat@users.noreply.github.com>
This commit is contained in:
tatankat
2023-02-02 16:44:01 +01:00
committed by GitHub
parent b901cb124a
commit c163e2e95e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+13 -1
View File
@@ -150,6 +150,18 @@ ldap_validate() {
[[ "$error_code" -eq 0 ]] || exit "$error_code"
}
########################
# Check if OpenLDAP is ready to answer
# Arguments:
# None
# Returns:
# Whether slapd is ready to answer
#########################
is_ldap_ready() {
# shellcheck disable=SC2015
is_ldap_running && debug_execute ldapsearch -Y EXTERNAL -H "ldapi:///" -b cn=config -s base || false
}
########################
# Check if OpenLDAP is running
# Globals:
@@ -197,7 +209,7 @@ ldap_start_bg() {
ulimit -n "$LDAP_ULIMIT_NOFILES"
am_i_root && flags=("-u" "$LDAP_DAEMON_USER" "${flags[@]}")
debug_execute slapd "${flags[@]}" &
if ! retry_while is_ldap_running "$retries" "$sleep_time"; then
if ! retry_while is_ldap_ready "$retries" "$sleep_time"; then
error "OpenLDAP failed to start"
return 1
fi