From 85765a0f0690d53954836f78c68a035617e97ae3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 28 Jun 2023 20:54:15 +0200 Subject: [PATCH] [bitnami/apache] Release 2.4.57-debian-11-r32 (#39191) Signed-off-by: Bitnami Containers --- bitnami/apache/2.4/debian-11/Dockerfile | 6 ++--- .../apache/2.4/debian-11/docker-compose.yml | 3 +++ .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libbitnami.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libfile.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libhook.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libnet.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 ++ .../opt/bitnami/scripts/libpersistence.sh | 2 ++ .../opt/bitnami/scripts/libservice.sh | 24 +++++++++++++++---- .../opt/bitnami/scripts/libvalidations.sh | 2 ++ .../opt/bitnami/scripts/libversion.sh | 2 ++ .../opt/bitnami/scripts/libwebserver.sh | 2 ++ .../prebuildfs/usr/sbin/install_packages | 2 ++ .../rootfs/opt/bitnami/scripts/apache-env.sh | 2 ++ .../opt/bitnami/scripts/apache/entrypoint.sh | 2 ++ .../opt/bitnami/scripts/apache/postunpack.sh | 2 ++ .../opt/bitnami/scripts/apache/reload.sh | 2 ++ .../opt/bitnami/scripts/apache/restart.sh | 2 ++ .../rootfs/opt/bitnami/scripts/apache/run.sh | 2 ++ .../opt/bitnami/scripts/apache/setup.sh | 2 ++ .../opt/bitnami/scripts/apache/start.sh | 2 ++ .../opt/bitnami/scripts/apache/status.sh | 2 ++ .../rootfs/opt/bitnami/scripts/apache/stop.sh | 2 ++ .../rootfs/opt/bitnami/scripts/libapache.sh | 2 ++ bitnami/apache/docker-compose.yml | 3 +++ 28 files changed, 75 insertions(+), 9 deletions(-) diff --git a/bitnami/apache/2.4/debian-11/Dockerfile b/bitnami/apache/2.4/debian-11/Dockerfile index 382d04bc38ae..fd354710f51e 100644 --- a/bitnami/apache/2.4/debian-11/Dockerfile +++ b/bitnami/apache/2.4/debian-11/Dockerfile @@ -6,10 +6,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-06-25T18:23:59Z" \ + org.opencontainers.image.created="2023-06-28T18:39:56Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.57-debian-11-r31" \ + org.opencontainers.image.ref.name="2.4.57-debian-11-r32" \ org.opencontainers.image.title="apache" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.57" @@ -25,7 +25,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libcrypt1 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ "apache-2.4.57-8-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/apache/2.4/debian-11/docker-compose.yml b/bitnami/apache/2.4/debian-11/docker-compose.yml index 7ce99e568afe..8dc387641215 100644 --- a/bitnami/apache/2.4/debian-11/docker-compose.yml +++ b/bitnami/apache/2.4/debian-11/docker-compose.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + version: '2' services: apache: diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e89cab32ce64..9482896e692f 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-6" + "version": "1.0.5-7" } } \ No newline at end of file diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 4242023f9415..184de8a117e2 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh index 41ebaf7464f6..63759c777f3b 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh index eb52f7644785..96b22f99710c 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh index 9694852a7d25..dadd06149e00 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh index c7c0f6d4422a..2a9e76a4d725 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh index 8bbf165e3e2a..b47c69a56825 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 6d9ca8546eef..c0500acee78d 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 99df69681c27..af6af64d6dd0 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index d70cf0779ec8..107f54e6b5c9 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -104,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -131,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -187,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -391,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <