From f8ffb085fface8b5aa3cd625acf488f52c0e02b7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 6 May 2020 13:17:07 +0000 Subject: [PATCH] 9.6.17-debian-10-r93 release --- bitnami/postgresql/9.6/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 9 ++++++++- bitnami/postgresql/README.md | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bitnami/postgresql/9.6/debian-10/Dockerfile b/bitnami/postgresql/9.6/debian-10/Dockerfile index 1e9cfd195e00..fc2b9c0abdee 100644 --- a/bitnami/postgresql/9.6/debian-10/Dockerfile +++ b/bitnami/postgresql/9.6/debian-10/Dockerfile @@ -21,7 +21,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="9.6.17-debian-10-r92" \ + BITNAMI_IMAGE_VERSION="9.6.17-debian-10-r93" \ 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/libservice.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 35c0163a9ef1..d5382a7cecc2 100644 --- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/postgresql/9.6/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/postgresql/README.md b/bitnami/postgresql/README.md index 50e5df452c03..a733c2f8a9b9 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`12-debian-10`, `12.2.0-debian-10-r92`, `12`, `12.2.0`, `latest` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.2.0-debian-10-r92/12/debian-10/Dockerfile) * [`11-debian-10`, `11.7.0-debian-10-r96`, `11`, `11.7.0` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.7.0-debian-10-r96/11/debian-10/Dockerfile) * [`10-debian-10`, `10.12.0-debian-10-r93`, `10`, `10.12.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.12.0-debian-10-r93/10/debian-10/Dockerfile) -* [`9.6-debian-10`, `9.6.17-debian-10-r92`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.17-debian-10-r92/9.6/debian-10/Dockerfile) +* [`9.6-debian-10`, `9.6.17-debian-10-r93`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.17-debian-10-r93/9.6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).