diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index feebfaf16fda..d97d5a29ed8b 100644 --- a/bitnami/git/2/debian-10/Dockerfile +++ b/bitnami/git/2/debian-10/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && apt-get upgrade -y && \ RUN /build/bitnami-user.sh ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.26.2-debian-10-r13" \ + BITNAMI_IMAGE_VERSION="2.26.2-debian-10-r14" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" ENTRYPOINT [ "git" ] diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 35c0163a9ef1..d5382a7cecc2 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/git/2/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/git/README.md b/bitnami/git/README.md index ebcfbad1a083..107c2cabf14d 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -28,7 +28,7 @@ $ docker run --name git bitnami/git:latest 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/). -* [`2-debian-10`, `2.26.2-debian-10-r13`, `2`, `2.26.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.26.2-debian-10-r13/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.26.2-debian-10-r14`, `2`, `2.26.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.26.2-debian-10-r14/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).