From 8018b1f8d706eba2758faa9ec952d705307bb1d9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Jul 2021 00:03:37 +0000 Subject: [PATCH] 7.13.3-debian-10-r0 release --- bitnami/kibana/7/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 39 +++++++++++++++++++ bitnami/kibana/README.md | 2 +- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/bitnami/kibana/7/debian-10/Dockerfile b/bitnami/kibana/7/debian-10/Dockerfile index d3a516fbefc6..7ff454171dda 100644 --- a/bitnami/kibana/7/debian-10/Dockerfile +++ b/bitnami/kibana/7/debian-10/Dockerfile @@ -12,13 +12,13 @@ COPY prebuildfs / RUN install_packages acl ca-certificates curl gzip libc6 libexpat1 libgcc1 libnss3 libstdc++6 procps tar RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.4.1-0" --checksum c88c76a7b5214407821771e5fc340f0320d5ded19eada938629603a982b8b640 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kibana" "7.13.2-0" --checksum 07fd4c4bf401c78d0f7c2780667a6536b233fe456957223dfabe3d8d074f3576 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kibana" "7.13.3-0" --checksum f452073d530d25ce5e2348d9bc4472d56acb2fc0de687abb1039366214040b42 RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/kibana/postunpack.sh ENV BITNAMI_APP_NAME="kibana" \ - BITNAMI_IMAGE_VERSION="7.13.2-debian-10-r12" + BITNAMI_IMAGE_VERSION="7.13.3-debian-10-r0" EXPOSE 5601 diff --git a/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 95a86d69f4e7..5ee9cc06e0f4 100644 --- a/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "kibana": { "arch": "amd64", - "digest": "07fd4c4bf401c78d0f7c2780667a6536b233fe456957223dfabe3d8d074f3576", + "digest": "f452073d530d25ce5e2348d9bc4472d56acb2fc0de687abb1039366214040b42", "distro": "debian-10", "type": "NAMI", - "version": "7.13.2-0" + "version": "7.13.3-0" }, "yq": { "arch": "amd64", diff --git a/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index b09575cbe4a6..dd47f25e4e45 100644 --- a/bitnami/kibana/7/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/kibana/7/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/kibana/README.md b/bitnami/kibana/README.md index a6d90aa5968f..6ea516e53361 100644 --- a/bitnami/kibana/README.md +++ b/bitnami/kibana/README.md @@ -35,7 +35,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/). -* [`7`, `7-debian-10`, `7.13.3`, `7.13.3-debian-10-r-1`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.13.3-debian-10-r-1/7/debian-10/Dockerfile) +* [`7`, `7-debian-10`, `7.13.3`, `7.13.3-debian-10-r0`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.13.3-debian-10-r0/7/debian-10/Dockerfile) * [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r142` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.10.2-debian-10-r142/7.10.2/debian-10/Dockerfile) * [`6`, `6-debian-10`, `6.8.17`, `6.8.17-debian-10-r0` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.17-debian-10-r0/6/debian-10/Dockerfile)