diff --git a/bitnami/apache/2.4/debian-12/Dockerfile b/bitnami/apache/2.4/debian-12/Dockerfile index eee75a8a2c69..90a0b74d8ada 100644 --- a/bitnami/apache/2.4/debian-12/Dockerfile +++ b/bitnami/apache/2.4/debian-12/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-03-01T19:05:50Z" \ + org.opencontainers.image.created="2024-03-05T11:31:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.58-debian-12-r18" \ + org.opencontainers.image.ref.name="2.4.58-debian-12-r19" \ org.opencontainers.image.title="apache" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.58" diff --git a/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh index ab451b6c1442..9c758d084f95 100755 --- a/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -10,6 +10,7 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Load libraries +. /opt/bitnami/scripts/libfs.sh . /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/libapache.sh @@ -22,6 +23,12 @@ apache_validate # Ensure Apache daemon user exists when running as 'root' am_i_root && ensure_user_exists "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP" +if ! is_dir_empty "$APACHE_DEFAULT_CONF_DIR"; then + # We add the copy from default config in the initialize function for web applications + # that make use of the Apache setup.sh script + debug "Copying files from $APACHE_DEFAULT_CONF_DIR to $APACHE_CONF_DIR" + cp -nr "$APACHE_DEFAULT_CONF_DIR"/. "$APACHE_CONF_DIR" +fi # Generate SSL certs (without a passphrase) ensure_dir_exists "${APACHE_CONF_DIR}/bitnami/certs" if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then