[bitnami/moodle] Release 4.0.7-debian-11-r12 (#31356)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-23 02:05:04 +02:00
committed by GitHub
parent 3f3ceb0e88
commit a67a626d47
5 changed files with 22 additions and 16 deletions

View File

@@ -4,11 +4,12 @@ ARG EXTRA_LOCALES
ARG TARGETARCH
ARG WITH_ALL_LOCALES="no"
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-19T22:50:40Z" \
LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-22T23:28:46Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="4.0.7-debian-11-r11" \
org.opencontainers.image.ref.name="4.0.7-debian-11-r12" \
org.opencontainers.image.title="moodle" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="4.0.7"
@@ -24,11 +25,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libedit2 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 locales procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"php-8.0.28-7-linux-${OS_ARCH}-debian-11" \
"apache-2.4.57-4-linux-${OS_ARCH}-debian-11" \
"php-8.0.28-8-linux-${OS_ARCH}-debian-11" \
"apache-2.4.57-5-linux-${OS_ARCH}-debian-11" \
"postgresql-client-13.10.0-4-linux-${OS_ARCH}-debian-11" \
"mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \
"libphp-8.0.28-8-linux-${OS_ARCH}-debian-11" \
"mysql-client-10.11.2-5-linux-${OS_ARCH}-debian-11" \
"libphp-8.0.28-9-linux-${OS_ARCH}-debian-11" \
"render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \
"moodle-4.0.7-3-linux-${OS_ARCH}-debian-11" \
) && \

View File

@@ -3,13 +3,13 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "2.4.57-4"
"version": "2.4.57-5"
},
"libphp": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "8.0.28-8"
"version": "8.0.28-9"
},
"moodle": {
"arch": "amd64",
@@ -21,13 +21,13 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "10.6.12-4"
"version": "10.11.2-5"
},
"php": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "8.0.28-7"
"version": "8.0.28-8"
},
"postgresql-client": {
"arch": "amd64",

View File

@@ -15,4 +15,3 @@ SetEnvIf X-Forwarded-Proto https HTTPS=on
ErrorDocument 503 /503.html
</VirtualHost>
Include "{{APACHE_CONF_DIR}}/bitnami/bitnami-ssl.conf"

View File

@@ -35,6 +35,10 @@ if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then
openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT")
rm -f "$SSL_CSR_FILE"
fi
# Load SSL configuration
if [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]] && [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then
ensure_apache_configuration_exists "Include \"${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf\"" "bitnami-ssl\.conf" "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
fi
# Copy vhosts files
if ! is_dir_empty "/vhosts"; then

View File

@@ -237,18 +237,20 @@ is_apache_not_running() {
# Arguments:
# $1 - configuration string
# $2 - pattern to use for checking if the configuration already exists (default: $1)
# $3 - Apache configuration file (default: $APACHE_CONF_FILE)
# Returns:
# None
########################
ensure_apache_configuration_exists() {
local -r conf="${1:?conf missing}"
local -r pattern="${2:-"$conf"}"
local -r conf_file="${3:-"$APACHE_CONF_FILE"}"
# Enable configuration by appending to httpd.conf
if ! grep -E -q "$pattern" "$APACHE_CONF_FILE"; then
if is_file_writable "$APACHE_CONF_FILE"; then
cat >> "$APACHE_CONF_FILE" <<< "$conf"
if ! grep -E -q "$pattern" "$conf_file"; then
if is_file_writable "$conf_file"; then
cat >> "$conf_file" <<< "$conf"
else
error "Could not add the following configuration to '${APACHE_CONF_FILE}:"
error "Could not add the following configuration to '${conf_file}:"
error ""
error "$(indent "$conf" 4)"
error ""