From cd9d812196d3c03c920899c7c78231df997f196c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 6 May 2020 14:54:55 +0000 Subject: [PATCH] 1.10.3-debian-10-r5 release --- bitnami/fluentd/1/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 9 ++++++++- bitnami/fluentd/README.md | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bitnami/fluentd/1/debian-10/Dockerfile b/bitnami/fluentd/1/debian-10/Dockerfile index e0bba1559ea4..fde26f37fd63 100644 --- a/bitnami/fluentd/1/debian-10/Dockerfile +++ b/bitnami/fluentd/1/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/fluentd/postunpack.sh ENV BITNAMI_APP_NAME="fluentd" \ - BITNAMI_IMAGE_VERSION="1.10.3-debian-10-r4" \ + BITNAMI_IMAGE_VERSION="1.10.3-debian-10-r5" \ GEM_HOME="/opt/bitnami/fluentd" \ PATH="/opt/bitnami/ruby/bin:/opt/bitnami/common/bin:/opt/bitnami/fluentd/bin:$PATH" diff --git a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 35c0163a9ef1..d5382a7cecc2 100644 --- a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -38,17 +38,24 @@ is_service_running() { # Stop a service by sending a termination signal to its pid # Arguments: # $1 - Pid file +# $2 - Signal number (optional) # Returns: # None ######################### stop_service_using_pid() { local pid_file="${1:?pid file is missing}" + local signal="${2:-}" local pid pid="$(get_pid_from_file "$pid_file")" [[ -z "$pid" ]] || ! is_service_running "$pid" && return - kill "$pid" + if [[ -n "$signal" ]]; then + kill "-${signal}" "$pid" + else + kill "$pid" + fi + local counter=10 while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do sleep 1 diff --git a/bitnami/fluentd/README.md b/bitnami/fluentd/README.md index ab5ab9c0c47e..688d5165699e 100644 --- a/bitnami/fluentd/README.md +++ b/bitnami/fluentd/README.md @@ -30,7 +30,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/). -* [`1-debian-10`, `1.10.3-debian-10-r4`, `1`, `1.10.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.10.3-debian-10-r4/1/debian-10/Dockerfile) +* [`1-debian-10`, `1.10.3-debian-10-r5`, `1`, `1.10.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.10.3-debian-10-r5/1/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/fluentd GitHub repo](https://github.com/bitnami/bitnami-docker-fluentd).