diff --git a/bitnami/postgresql-repmgr/17/debian-12/Dockerfile b/bitnami/postgresql-repmgr/17/debian-12/Dockerfile index 1cef2741ea67..b9b5e4ef610a 100644 --- a/bitnami/postgresql-repmgr/17/debian-12/Dockerfile +++ b/bitnami/postgresql-repmgr/17/debian-12/Dockerfile @@ -8,11 +8,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="2025-02-02T06:17:05Z" \ + org.opencontainers.image.created="2025-02-11T14:40:39Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="17.2.0-debian-12-r8" \ + org.opencontainers.image.ref.name="17.2.0-debian-12-r9" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 970d62417964..1337f6c2dd59 100644 --- a/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -121,7 +121,7 @@ relativize() { } ######################## -# Configure permisions and ownership recursively +# Configure permissions and ownership recursively # Globals: # None # Arguments: diff --git a/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/libpostgresql.sh index 74e19f4b9660..d381fe6074c9 100644 --- a/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/libpostgresql.sh +++ b/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/libpostgresql.sh @@ -588,11 +588,12 @@ postgresql_clean_from_restart() { # Globals: # POSTGRESQL_* # Arguments: -# None +# $1 - skip_replication configuration. Boolean, default false # Returns: # None ######################### postgresql_initialize() { + local -r skip_replication=${1:-false} info "Initializing PostgreSQL database..." # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run @@ -638,9 +639,9 @@ postgresql_initialize() { is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters is_boolean_yes "$create_conf_file" && postgresql_configure_fsync is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication - [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]] && postgresql_configure_recovery + [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && ! $skip_replication && postgresql_add_replication_to_pghba + [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && is_boolean_yes "$create_pghba_file" && ! $skip_replication && postgresql_configure_synchronous_replication + [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]] && ! $skip_replication && postgresql_configure_recovery else if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then postgresql_master_init_db @@ -655,19 +656,19 @@ postgresql_initialize() { postgresql_create_admin_user fi is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && postgresql_create_replication_user - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication + [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && ! $skip_replication && postgresql_create_replication_user + is_boolean_yes "$create_conf_file" && ! $skip_replication && postgresql_configure_replication_parameters + is_boolean_yes "$create_pghba_file" && ! $skip_replication && postgresql_configure_synchronous_replication is_boolean_yes "$create_conf_file" && postgresql_configure_fsync is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba + [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && ! $skip_replication && postgresql_add_replication_to_pghba else postgresql_slave_init_db is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters + is_boolean_yes "$create_conf_file" && ! $skip_replication && postgresql_configure_replication_parameters is_boolean_yes "$create_conf_file" && postgresql_configure_fsync is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - postgresql_configure_recovery + ! $skip_replication && postgresql_configure_recovery fi fi # TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file diff --git a/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/librepmgr.sh b/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/librepmgr.sh index 4d49fb5da567..85d3dc4390ab 100644 --- a/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/librepmgr.sh +++ b/bitnami/postgresql-repmgr/17/debian-12/rootfs/opt/bitnami/scripts/librepmgr.sh @@ -852,7 +852,8 @@ repmgr_initialize() { repmgr_wait_primary_node || exit 1 repmgr_rewind fi - postgresql_initialize + # Run postgresql initialization skipping replication config + postgresql_initialize true if ! repmgr_is_file_external "postgresql.conf"; then # Allow remote connections, required to register primary and standby nodes postgresql_enable_remote_connections