diff --git a/bitnami/couchdb/3/debian-10/Dockerfile b/bitnami/couchdb/3/debian-10/Dockerfile index 7edddc43e754..6e890f29d78b 100644 --- a/bitnami/couchdb/3/debian-10/Dockerfile +++ b/bitnami/couchdb/3/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/couchdb/postunpack.sh ENV BITNAMI_APP_NAME="couchdb" \ - BITNAMI_IMAGE_VERSION="3.1.1-debian-10-r254" \ + BITNAMI_IMAGE_VERSION="3.1.1-debian-10-r255" \ LD_LIBRARY_PATH="/opt/bitnami/common/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/couchdb/bin:$PATH" diff --git a/bitnami/couchdb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/couchdb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index b09575cbe4a6..dd47f25e4e45 100644 --- a/bitnami/couchdb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/couchdb/3/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/couchdb/README.md b/bitnami/couchdb/README.md index bc34fd4c694a..0d10c95e5185 100644 --- a/bitnami/couchdb/README.md +++ b/bitnami/couchdb/README.md @@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`3`, `3-debian-10`, `3.1.1`, `3.1.1-debian-10-r254`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-couchdb/blob/3.1.1-debian-10-r254/3/debian-10/Dockerfile) +* [`3`, `3-debian-10`, `3.1.1`, `3.1.1-debian-10-r255`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-couchdb/blob/3.1.1-debian-10-r255/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/couchdb GitHub repo](https://github.com/bitnami/bitnami-docker-couchdb).