diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile index cc9a69400cea..c502ee6515f0 100644 --- a/bitnami/postgresql/10/debian-10/Dockerfile +++ b/bitnami/postgresql/10/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libnettle6 libp11-kit0 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.15.0-0" --checksum 184441aee46e35fdd92fb27c6295e95f10591cfb524e8c9167dc39a140977675 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.15.0-1" --checksum f0c2288562100d52eb0456b3cf1ed23d4982eaac242b590d21bca24ccda99097 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -24,7 +24,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="10.15.0-debian-10-r0" \ + BITNAMI_IMAGE_VERSION="10.15.0-debian-10-r1" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 7051c5352b98..96ed896363d2 100644 --- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,9 +8,9 @@ }, "postgresql": { "arch": "amd64", - "digest": "184441aee46e35fdd92fb27c6295e95f10591cfb524e8c9167dc39a140977675", + "digest": "f0c2288562100d52eb0456b3cf1ed23d4982eaac242b590d21bca24ccda99097", "distro": "debian-10", "type": "NAMI", - "version": "10.15.0-0" + "version": "10.15.0-1" } } \ No newline at end of file diff --git a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh index 8e6faa3ca5b9..d2b44756b758 100644 --- a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh +++ b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh @@ -392,12 +392,26 @@ postgresql_configure_replication_parameters() { postgresql_set_property "wal_keep_segments" "12" fi postgresql_set_property "hot_standby" "on" +} + + +######################## +# Change postgresql.conf by setting parameters for synchronous replication +# Globals: +# POSTGRESQL_* +# Arguments: +# None +# Returns: +# None +######################### +postgresql_configure_synchronous_replication() { 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}\")" fi } + ######################## # Change postgresql.conf by setting TLS properies # Globals: @@ -592,6 +606,7 @@ postgresql_initialize() { 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 else if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then @@ -609,6 +624,7 @@ postgresql_initialize() { 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 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 diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index d329f02506f4..6323a81cdda8 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r1` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r1/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r1` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r1/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r1`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r1/11/debian-10/Dockerfile) -* [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r0/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r1` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r1/10/debian-10/Dockerfile) * [`9.6`, `9.6-debian-10`, `9.6.20`, `9.6.20-debian-10-r1` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.20-debian-10-r1/9.6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).