From a9fcf5367650ffb7a07f25d54b4a90f7cd1b1f90 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Apr 2021 13:28:28 +0000 Subject: [PATCH] 9.6.21-debian-10-r58 release --- bitnami/postgresql/9.6/debian-10/Dockerfile | 2 +- .../debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libversion.sh | 4 ++-- .../debian-10/rootfs/opt/bitnami/scripts/libautoctl.sh | 3 +-- .../debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh | 8 +++----- .../opt/bitnami/scripts/locales/add-extra-locales.sh | 1 + bitnami/postgresql/README.md | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bitnami/postgresql/9.6/debian-10/Dockerfile b/bitnami/postgresql/9.6/debian-10/Dockerfile index d3536e7a5e61..fbcbddd66e98 100644 --- a/bitnami/postgresql/9.6/debian-10/Dockerfile +++ b/bitnami/postgresql/9.6/debian-10/Dockerfile @@ -22,7 +22,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="9.6.21-debian-10-r57" \ + BITNAMI_IMAGE_VERSION="9.6.21-debian-10-r58" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..c7c0f6d4422a 100644 --- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,7 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done + # shellcheck disable=SC2001 + # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions echo "$string" | sed "s/^/${indent_unit}/" } diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libautoctl.sh b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libautoctl.sh index 874998c9b33c..09e7d53fe19b 100644 --- a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libautoctl.sh +++ b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libautoctl.sh @@ -2,8 +2,7 @@ # # Bitnami pg_auto_failover library -# shellcheck disable=SC1091 -# shellcheck disable=SC1090 +# shellcheck disable=SC1090,SC1091 # Load PostgreSQL library . /opt/bitnami/scripts/libpostgresql.sh diff --git a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh index 26653aa9c7e7..d568f8218e6d 100644 --- a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh +++ b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh @@ -2,8 +2,7 @@ # # Bitnami PostgreSQL library -# shellcheck disable=SC1091 -# shellcheck disable=SC1090 +# shellcheck disable=SC1090,SC1091 # Load Generic Libraries . /opt/bitnami/scripts/libfile.sh @@ -294,7 +293,6 @@ EOF ######################### postgresql_restrict_pghba() { if [[ -n "$POSTGRESQL_PASSWORD" ]]; then - local pghba_file replace_in_file "$POSTGRESQL_PGHBA_FILE" "trust" "md5" false fi } @@ -595,7 +593,7 @@ postgresql_initialize() { else if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then postgresql_master_init_db - postgresql_start_bg + postgresql_start_bg "false" [[ -n "${POSTGRESQL_DATABASE}" ]] && [[ "$POSTGRESQL_DATABASE" != "postgres" ]] && postgresql_create_custom_database if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then postgresql_alter_postgres_user "$POSTGRESQL_PASSWORD" @@ -671,7 +669,7 @@ postgresql_custom_init_scripts() { info "Loading custom scripts..." if [[ -d "$POSTGRESQL_INITSCRIPTS_DIR" ]] && [[ -n $(find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && [[ ! -f "$POSTGRESQL_VOLUME_DIR/.user_scripts_initialized" ]]; then info "Loading user's custom files from $POSTGRESQL_INITSCRIPTS_DIR ..." - postgresql_start_bg + postgresql_start_bg "false" find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)" | sort | while read -r f; do case "$f" in *.sh) diff --git a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh index 601a83c04d97..de3120bd8ec0 100755 --- a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh +++ b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh @@ -33,6 +33,7 @@ if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then echo "Enabling all locales" cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE" else + # shellcheck disable=SC2001 LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")" while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do echo "Enabling locale ${locale}" diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index f46b71ba4e40..d4c7f8cdf09b 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`12`, `12-debian-10`, `12.6.0`, `12.6.0-debian-10-r57` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.6.0-debian-10-r57/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.11.0`, `11.11.0-debian-10-r58`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.11.0-debian-10-r58/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.16.0`, `10.16.0-debian-10-r57` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.16.0-debian-10-r57/10/debian-10/Dockerfile) -* [`9.6`, `9.6-debian-10`, `9.6.21`, `9.6.21-debian-10-r57` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.21-debian-10-r57/9.6/debian-10/Dockerfile) +* [`9.6`, `9.6-debian-10`, `9.6.21`, `9.6.21-debian-10-r58` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.21-debian-10-r58/9.6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).