13.5.0-debian-10-r56 release

2026-02-24 07:07:37 +08:00 · 2022-01-11 12:14:45 +00:00
parent 9e29c34178
commit c651ba4660
5 changed files with 32 additions and 10 deletions
--- a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
+++ b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
@@ -9,8 +9,8 @@ ENV HOME="/" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libbsd0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libp11-kit0 libpcre3 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-repmgr" "13.5.0-3" --checksum eb647f3a1d659886d026ebf3bdceccccb3a743b1ae210b5def166671993a6a25
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-repmgr" "13.5.0-4" --checksum ed91ecd78145e0e982c6cdff143e8a4bba39d4785ef63f3c4f01198cc202a1bf
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-1" --checksum 16f1a317859b06ae82e816b30f98f28b4707d18fe6cc3881bff535192a7715dc
 RUN chmod g+rwX /opt/bitnami
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
@@ -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.5.0-debian-10-r55" \
+    BITNAMI_IMAGE_VERSION="13.5.0-debian-10-r56" \
    LANG="en_US.UTF-8" \
    LANGUAGE="en_US:en" \
    NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
--- a/bitnami/postgresql-repmgr/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,16 +1,16 @@
 {
    "gosu": {
        "arch": "amd64",
-        "digest": "3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e",
+        "digest": "16f1a317859b06ae82e816b30f98f28b4707d18fe6cc3881bff535192a7715dc",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "1.14.0-0"
+        "version": "1.14.0-1"
    },
    "postgresql-repmgr": {
        "arch": "amd64",
-        "digest": "eb647f3a1d659886d026ebf3bdceccccb3a743b1ae210b5def166671993a6a25",
+        "digest": "ed91ecd78145e0e982c6cdff143e8a4bba39d4785ef63f3c4f01198cc202a1bf",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "13.5.0-3"
+        "version": "13.5.0-4"
    }
 }
--- a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -11,6 +11,7 @@
 . /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/libservice.sh
 . /opt/bitnami/scripts/libvalidations.sh
+. /opt/bitnami/scripts/libnet.sh

 ########################
 # Configure libnss_wrapper so PostgreSQL commands work with a random user.
@@ -388,9 +389,27 @@ postgresql_configure_replication_parameters() {
 #   None
 #########################
 postgresql_configure_synchronous_replication() {
+    local replication_nodes=""
+    info "Configuring synchronous_replication"
+
+    # Check for comma separate values
+    # When using repmgr, POSTGRESQL_CLUSTER_APP_NAME will contain the list of nodes to be synchronous
+    # This list need to cleaned from other things but node names.
+    if [[ "$POSTGRESQL_CLUSTER_APP_NAME" == *","* ]]; then
+        read -r -a nodes <<<"$(tr ',;' ' ' <<<"${POSTGRESQL_CLUSTER_APP_NAME}")"
+        for node in "${nodes[@]}"; do
+            [[ "$node" =~ ^(([^:/?#]+):)?// ]] || node="tcp://${node}"
+
+            host="$(parse_uri "$node" 'host')"
+            replication_nodes="${replication_nodes}${replication_nodes:+,}\"${host}\""
+        done
+    else
+        replication_nodes="\"${POSTGRESQL_CLUSTER_APP_NAME}\""
+    fi
+
    if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS > 0)); then
        postgresql_set_property "synchronous_commit" "$POSTGRESQL_SYNCHRONOUS_COMMIT_MODE"
-        postgresql_set_property "synchronous_standby_names" "${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS} (\"${POSTGRESQL_CLUSTER_APP_NAME}\")"
+        postgresql_set_property "synchronous_standby_names" "${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS} (${replication_nodes})"
    fi
 }

--- 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
@@ -358,7 +358,6 @@ repmgr_inject_postgresql_configuration() {
    postgresql_set_property "archive_command" "/bin/true"
    postgresql_configure_connections
    postgresql_configure_timezone
-    postgresql_configure_synchronous_replication
    # Redirect logs to POSTGRESQL_LOG_FILE
    postgresql_configure_logging
    postgresql_set_property "logging_collector" "on"
@@ -724,6 +723,10 @@ repmgr_initialize() {
            repmgr_register_primary
            # Allow running custom initialization scripts
            postgresql_custom_init_scripts
+            # Set synchronous replication
+            POSTGRESQL_CLUSTER_APP_NAME="$REPMGR_PARTNER_NODES"
+            export POSTGRESQL_CLUSTER_APP_NAME
+            postgresql_configure_synchronous_replication
        elif is_boolean_yes "$REPMGR_UPGRADE_EXTENSION"; then
            # Upgrade repmgr extension
            postgresql_start_bg
--- a/bitnami/postgresql-repmgr/README.md
+++ b/bitnami/postgresql-repmgr/README.md
@@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t


 * [`14`, `14-debian-10`, `14.1.0`, `14.1.0-debian-10-r56` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/14.1.0-debian-10-r56/14/debian-10/Dockerfile)
-* [`13`, `13-debian-10`, `13.5.0`, `13.5.0-debian-10-r55` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.5.0-debian-10-r55/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.5.0`, `13.5.0-debian-10-r56` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.5.0-debian-10-r56/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.9.0`, `12.9.0-debian-10-r60` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.9.0-debian-10-r60/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.14.0`, `11.14.0-debian-10-r52`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.14.0-debian-10-r52/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.19.0`, `10.19.0-debian-10-r60` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.19.0-debian-10-r60/10/debian-10/Dockerfile)