diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile index bc54c75bd0a3..e562c7167785 100644 --- a/bitnami/apache/2.4/debian-10/Dockerfile +++ b/bitnami/apache/2.4/debian-10/Dockerfile @@ -21,7 +21,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="apache" \ - BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r38" \ + BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r39" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 35c0163a9ef1..d5382a7cecc2 100644 --- a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/apache/2.4/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/apache/README.md b/bitnami/apache/README.md index a90ef367b67a..45a8dd5675c9 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -43,7 +43,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/). -* [`2.4-debian-10`, `2.4.43-debian-10-r38`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r38/2.4/debian-10/Dockerfile) +* [`2.4-debian-10`, `2.4.43-debian-10-r39`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r39/2.4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).