diff --git a/bitnami/openldap/2.5/debian-11/Dockerfile b/bitnami/openldap/2.5/debian-11/Dockerfile index e3aea49b2011..7c9db6d534c6 100644 --- a/bitnami/openldap/2.5/debian-11/Dockerfile +++ b/bitnami/openldap/2.5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-20T01:09:28Z" \ + org.opencontainers.image.created="2024-01-29T21:44:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.5.16-debian-11-r63" \ + org.opencontainers.image.ref.name="2.5.16-debian-11-r64" \ org.opencontainers.image.title="openldap" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.5.16" @@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libargon2-1 libcap2-bin libcom-err2 libcrypt1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libltdl7 libnsl2 libnss3-tools libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "openldap-2.5.16-1-linux-${OS_ARCH}-debian-11" \ + "openldap-2.5.16-2-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b80999bc41a7..6f8cc4a9a6fe 100644 --- a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.5.16-1" + "version": "2.5.16-2" } } \ No newline at end of file diff --git a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index d44524baad7a..c231760d8e4e 100644 --- a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -646,13 +646,7 @@ ldap_initialize() { if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then ldap_enable_syncprov fi - # enable tls - if is_boolean_yes "$LDAP_ENABLE_TLS"; then - ldap_configure_tls - if is_boolean_yes "$LDAP_REQUIRE_TLS"; then - ldap_configure_tls_required - fi - fi + # load custom ldifs if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then ldap_add_custom_ldifs elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then @@ -660,7 +654,14 @@ ldap_initialize() { else info "Skipping default schemas/tree structure" fi - ldap_stop + # enable tls + if is_boolean_yes "$LDAP_ENABLE_TLS"; then + ldap_configure_tls + if is_boolean_yes "$LDAP_REQUIRE_TLS"; then + ldap_configure_tls_required + fi + fi + ldap_stop fi }