diff --git a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile index 5d401840b384..79f4ae6046d0 100644 --- a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile +++ b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV BITNAMI_APP_NAME="postgresql-repmgr" \ - BITNAMI_IMAGE_VERSION="13.4.0-debian-10-r88" \ + BITNAMI_IMAGE_VERSION="13.4.0-debian-10-r89" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh index 8d8219a4353f..ef7d50169c7c 100644 --- a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh +++ b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh @@ -400,6 +400,24 @@ local all all trust EOF } +######################## +# Check if a given configuration file was mounted externally +# Globals: +# REPMGR_MOUNTED_CONF_DIR +# Arguments: +# $1 - Filename +# Returns: +# 1 if the file was mounted externally, 0 otherwise +######################### +repmgr_is_file_external() { + local -r filename=$1 + if [[ -d "$REPMGR_MOUNTED_CONF_DIR" ]] && [[ -f "$REPMGR_MOUNTED_CONF_DIR"/"$filename" ]]; then + return 0 + else + return 1 + fi +} + ######################## # Prepare PostgreSQL default configuration # Globals: @@ -418,12 +436,12 @@ repmgr_postgresql_configuration() { debug "User injected custom configuration detected!" fi ensure_dir_exists "$POSTGRESQL_MOUNTED_CONF_DIR" - if [[ -f "${REPMGR_MOUNTED_CONF_DIR}/postgresql.conf" ]]; then + if repmgr_is_file_external "postgresql.conf"; then cp "${REPMGR_MOUNTED_CONF_DIR}/postgresql.conf" "${POSTGRESQL_MOUNTED_CONF_DIR}/postgresql.conf" else repmgr_inject_postgresql_configuration fi - if [[ -f "${REPMGR_MOUNTED_CONF_DIR}/pg_hba.conf" ]]; then + if repmgr_is_file_external "pg_hba.conf"; then cp "${REPMGR_MOUNTED_CONF_DIR}/pg_hba.conf" "${POSTGRESQL_MOUNTED_CONF_DIR}/pg_hba.conf" else repmgr_inject_pghba_configuration @@ -683,7 +701,7 @@ repmgr_initialize() { fi fi postgresql_initialize - if ! postgresql_is_file_external "postgresql.conf"; then + if ! repmgr_is_file_external "postgresql.conf"; then # Allow remote connections, required to register primary and standby nodes postgresql_enable_remote_connections # Configure port and restrict access to PostgreSQL (MD5) @@ -692,7 +710,7 @@ repmgr_initialize() { postgresql_configure_replication_parameters postgresql_configure_fsync fi - if ! postgresql_is_file_external "pg_hba.conf"; then + if ! repmgr_is_file_external "pg_hba.conf"; then is_boolean_yes "$REPMGR_PGHBA_TRUST_ALL" || postgresql_restrict_pghba fi if [[ "$REPMGR_ROLE" = "primary" ]]; then diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index 3accd1a54f74..51e72a262084 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`14`, `14-debian-10`, `14.0.0`, `14.0.0-debian-10-r20` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/14.0.0-debian-10-r20/14/debian-10/Dockerfile) -* [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r88` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.4.0-debian-10-r88/13/debian-10/Dockerfile) +* [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r89` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.4.0-debian-10-r89/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r93` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.8.0-debian-10-r93/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r58`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.13.0-debian-10-r58/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r89` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.18.0-debian-10-r89/10/debian-10/Dockerfile)