diff --git a/bitnami/apache/2.4/debian-12/Dockerfile b/bitnami/apache/2.4/debian-12/Dockerfile index 32c4f46cae10..dcb5a6d73162 100644 --- a/bitnami/apache/2.4/debian-12/Dockerfile +++ b/bitnami/apache/2.4/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-09-07T00:20:23Z" \ + org.opencontainers.image.created="2025-10-07T00:40:50Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/apache/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/apache" \ @@ -52,7 +52,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="2.4.65" \ BITNAMI_APP_NAME="apache" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="5" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh index 886962ebd276..a8293800d55c 100644 --- a/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -259,6 +259,8 @@ generate_systemd_conf() { local success_exit_status="" local custom_service_content="" local working_directory="" + local timeout_start_sec="2min" + local timeout_stop_sec="30s" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -277,6 +279,8 @@ generate_systemd_conf() { | --success-exit-status \ | --custom-service-content \ | --working-directory \ + | --timeout-start-sec \ + | --timeout-stop-sec \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -402,8 +406,8 @@ EOF fi cat >> "$service_file" <