diff --git a/bitnami/openldap/2.5/debian-12/Dockerfile b/bitnami/openldap/2.5/debian-12/Dockerfile index d529ae29f72f..9bc3261c5580 100644 --- a/bitnami/openldap/2.5/debian-12/Dockerfile +++ b/bitnami/openldap/2.5/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-09-01T18:56:59Z" \ + org.opencontainers.image.created="2024-09-04T10:22:52Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/openldap/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.5.18-debian-12-r8" \ + org.opencontainers.image.ref.name="2.5.18-debian-12-r9" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/openldap" \ org.opencontainers.image.title="openldap" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/openldap/2.5/debian-12/rootfs/opt/bitnami/scripts/openldap/run.sh b/bitnami/openldap/2.5/debian-12/rootfs/opt/bitnami/scripts/openldap/run.sh index 98973ff42a1a..d8e9af658f83 100755 --- a/bitnami/openldap/2.5/debian-12/rootfs/opt/bitnami/scripts/openldap/run.sh +++ b/bitnami/openldap/2.5/debian-12/rootfs/opt/bitnami/scripts/openldap/run.sh @@ -44,7 +44,7 @@ flags_map["-h"]+="${flags_map["-h"]:+" "}ldapi:///" if ! is_boolean_yes "${LDAP_ENABLE_PROXYPROTO}" \ || [[ "${LDAP_PORT_NUMBER}" -ne "${LDAP_PROXYPROTO_PORT_NUMBER}" ]] then - flags_map["-h"]+="${flags_map["-h"]:+" "}ldap://:${LDAP_PORT_NUMBER}/" + flags_map["-h"]+="${flags_map["-h"]:+" "}ldap://:${LDAP_PORT_NUMBER}/" fi # Add LDAPS URI when TLS is enabled @@ -53,23 +53,23 @@ fi # * proxy protocol capability is disabled # * proxy protocol capability is enabled and proxy protocol tls port differ if is_boolean_yes "${LDAP_ENABLE_TLS}" \ - && { ! is_boolean_yes "${LDAP_ENABLE_PROXYPROTO}" \ - || [[ "${LDAP_LDAPS_PORT_NUMBER}" -ne "${LDAP_PROXYPROTO_LDAPS_PORT_NUMBER}" ]]; } + && { ! is_boolean_yes "${LDAP_ENABLE_PROXYPROTO}" \ + || [[ "${LDAP_LDAPS_PORT_NUMBER}" -ne "${LDAP_PROXYPROTO_LDAPS_PORT_NUMBER}" ]]; } then - flags_map["-h"]+="${flags_map["-h"]:+" "}ldaps://:${LDAP_LDAPS_PORT_NUMBER}/" + flags_map["-h"]+="${flags_map["-h"]:+" "}ldaps://:${LDAP_LDAPS_PORT_NUMBER}/" fi # Add PLDAP URI when proxy protocol capability is enabled if is_boolean_yes "${LDAP_ENABLE_PROXYPROTO}"; then - flags_map["-h"]+="${flags_map["-h"]:+" "}pldap://:${LDAP_PROXYPROTO_PORT_NUMBER}/" - # Also add PLDAPS URI when TLS is enabled - is_boolean_yes "${LDAP_ENABLE_TLS}" \ - && flags_map["-h"]+="${flags_map["-h"]:+" "}pldaps://:${LDAP_PROXYPROTO_LDAPS_PORT_NUMBER}/" + flags_map["-h"]+="${flags_map["-h"]:+" "}pldap://:${LDAP_PROXYPROTO_PORT_NUMBER}/" + # Also add PLDAPS URI when TLS is enabled + is_boolean_yes "${LDAP_ENABLE_TLS}" \ + && flags_map["-h"]+="${flags_map["-h"]:+" "}pldaps://:${LDAP_PROXYPROTO_LDAPS_PORT_NUMBER}/" fi # Build flags list for flag in "${!flags_map[@]}"; do - flags+=("${flag}" "${flags_map[${flag}]}") + flags+=("${flag}" "${flags_map[${flag}]}") done # Add "@" so users can add extra command line flags