[bitnami/dokuwiki] Release 20220731.1.0-debian-11-r23 (#14539)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2022-11-22 10:33:27 +01:00 committed by GitHub
parent edcf7910d6
commit d184b669e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 7 deletions

View File

@ -4,7 +4,7 @@ ARG TARGETARCH
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
org.opencontainers.image.description="Application packaged by Bitnami" \
org.opencontainers.image.ref.name="20220731.1.0-debian-11-r22" \
org.opencontainers.image.ref.name="20220731.1.0-debian-11-r23" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/dokuwiki" \
org.opencontainers.image.title="dokuwiki" \
org.opencontainers.image.vendor="VMware, Inc." \

View File

@ -37,12 +37,6 @@ done
info "Configuring default PHP options for DokuWiki"
php_conf_set memory_limit "$PHP_DEFAULT_MEMORY_LIMIT"
# Fix DOKU_INC, since we split application from state, DokuWiki's plugins and templates need to know where they live
info "Fix DOKU_INC variable"
auto_prepend_file="$DOKUWIKI_BASE_DIR/conf/auto_prepend.php"
printf '<?php\ndefine("DOKU_INC", "%s/");\n' "$DOKUWIKI_BASE_DIR" >>"$auto_prepend_file"
php_conf_set auto_prepend_file "$auto_prepend_file"
# Enable default web server configuration for DokuWiki
info "Creating default web server configuration for DokuWiki"
web_server_validate

View File

@ -3,12 +3,14 @@
# Bitnami DokuWiki library
# shellcheck disable=SC1091
. /opt/bitnami/scripts/php-env.sh
# Load generic libraries
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libvalidations.sh
. /opt/bitnami/scripts/libpersistence.sh
. /opt/bitnami/scripts/libphp.sh
. /opt/bitnami/scripts/libwebserver.sh
########################
@ -60,6 +62,7 @@ dokuwiki_initialize() {
dokuwiki_pass_wizard
web_server_stop
dokuwiki_enable_friendly_urls
dokuwiki_configure_DOKU_INC
fi
info "Persisting DokuWiki installation"
@ -123,3 +126,21 @@ dokuwiki_enable_friendly_urls() {
# Based on: https://www.dokuwiki.org/rewrite
echo "\$conf['userewrite'] = 1; // URL rewriting is handled by the webserver" >>"${DOKUWIKI_BASE_DIR}/conf/local.php"
}
########################
# Configure DOKU_INC
# Globals:
# DOKUWIKI_*
# Arguments:
# None
# Returns:
# None
#########################
dokuwiki_configure_DOKU_INC() {
# Based on: https://github.com/bitnami/containers/pull/12535
# Fix DOKU_INC, since we split application from state, DokuWiki's plugins and templates need to know where they live
info "Fix DOKU_INC variable"
auto_prepend_file="$DOKUWIKI_BASE_DIR/conf/auto_prepend.php"
printf '<?php\ndefine("DOKU_INC", "%s/");\n' "$DOKUWIKI_BASE_DIR" >>"$auto_prepend_file"
php_conf_set auto_prepend_file "$auto_prepend_file"
}