From 86228c2e4d49a480c5b3bec0a7b724d136c45595 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Jul 2021 02:39:16 +0000 Subject: [PATCH] 13.3.0-debian-10-r43 release --- .../postgresql-repmgr/13/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 39 +++++++++++++++++++ bitnami/postgresql-repmgr/README.md | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile index 97f151f3251d..80fc356acbfb 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.3.0-debian-10-r42" \ + BITNAMI_IMAGE_VERSION="13.3.0-debian-10-r43" \ 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/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/postgresql-repmgr/13/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index b09575cbe4a6..dd47f25e4e45 100644 --- a/bitnami/postgresql-repmgr/13/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/postgresql-repmgr/13/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -2,6 +2,11 @@ # # Library for managing files +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libos.sh + # Functions ######################## @@ -78,3 +83,37 @@ append_file_after_last_match() { result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)" echo "$result" > "$file" } + +######################## +# Wait until certain entry is present in a log file +# Arguments: +# $1 - entry to look for +# $2 - log file +# $3 - max retries. Default: 12 +# $4 - sleep between retries (in seconds). Default: 5 +# Returns: +# Boolean +######################### +wait_for_log_entry() { + local -r entry="${1:-missing entry}" + local -r log_file="${2:-missing log file}" + local -r retries="${3:-12}" + local -r interval_time="${4:-5}" + local attempt=0 + + check_log_file_for_entry() { + if ! grep -qE "$entry" "$log_file"; then + debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})" + return 1 + fi + } + debug "Checking that ${log_file} log file contains entry \"${entry}\"" + if retry_while check_log_file_for_entry "$retries" "$interval_time"; then + debug "Found entry \"${entry}\" in ${log_file}" + true + else + error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries" + debug_execute cat "$log_file" + return 1 + fi +} diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index 722a57a8c9e3..3f8b97d78117 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -43,7 +43,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`13`, `13-debian-10`, `13.3.0`, `13.3.0-debian-10-r42` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.3.0-debian-10-r42/13/debian-10/Dockerfile) +* [`13`, `13-debian-10`, `13.3.0`, `13.3.0-debian-10-r43` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.3.0-debian-10-r43/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.7.0`, `12.7.0-debian-10-r48` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.7.0-debian-10-r48/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.12.0`, `11.12.0-debian-10-r46`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.12.0-debian-10-r46/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.17.0`, `10.17.0-debian-10-r36` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.17.0-debian-10-r36/10/debian-10/Dockerfile)