- Add short URL support,
- Based on rx3-docker/php-apache:1.6.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images.
This commit is contained in:
parent
0aae3ab46d
commit
10e422c206
32
Dockerfile
32
Dockerfile
@ -15,6 +15,10 @@ LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
||||
LABEL maintainer=${IMG_MAINTAINER}ARG MEDIAWIKI_VERSION=1.43.5
|
||||
|
||||
ARG HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d
|
||||
ARG MEDIAWIKI_CORE_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-mediawiki-core.conf
|
||||
ARG MEDIAWIKI_SURL_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/65-mediawiki-short_url.conf
|
||||
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
@ -25,21 +29,33 @@ chmod -R a-x,a+X /var/www/mediawiki /etc/
|
||||
chmod o-rwx /var/www/mediawiki /etc/mediawiki \n\
|
||||
chmod -R u+rwX /var/www/mediawiki \n\
|
||||
\n\
|
||||
if [[ "${WIKIMEDIA_CONFIG}" == "TRUE" ]] \n\
|
||||
if [[ "${MEDIAWIKI_CONFIG}" == "TRUE" ]] \n\
|
||||
then \n\
|
||||
sed -i "s/Require local/Require all granted/" /etc/httpd/conf/webapps.d/mediawiki.conf \n\
|
||||
sed -i "s/Require local/Require all granted/" '${MEDIAWIKI_CORE_CONF_FILE}' \n\
|
||||
fi \n\
|
||||
\n\
|
||||
sed -i -e "s%Alias /mediawiki%Alias ${WIKIMEDIA_PATH}%" /etc/httpd/conf/webapps.d/mediawiki.conf \n\
|
||||
sed -i -e "s%Alias /mediawiki%Alias ${MEDIAWIKI_URL}%" '${MEDIAWIKI_CORE_CONFIG_FILE}' \n\
|
||||
sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%" '${MEDIAWIKI_SURL_CONFIG_FILE}' \n\
|
||||
\n\
|
||||
sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration \n\
|
||||
\n\
|
||||
RewriteCond /usr/share%{REQUEST_URI} !-f \n\
|
||||
RewriteCond /usr/share%{REQUEST_URI} !-d \n\
|
||||
\n\
|
||||
RewriteRule "^/?MEDIAWIKI_URL(/.*)?$" "/usr/share/mediawiki/index.php" [L,QSA] \n\
|
||||
'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
RUN urpmi.update -a \
|
||||
&& urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql \
|
||||
&& echo -e "${MEDIAWIKI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/mediawiki \
|
||||
&& chmod a+x /etc/init.d/mediawiki \
|
||||
|
||||
RUN urpmi.update -a \
|
||||
&& urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql \
|
||||
&& mv /etc/httpd/conf/sites.d/mediawiki.conf ${MEDIAWIKI_CORE_CONFIG_FILE} \
|
||||
&& echo -e "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${MEDIAWIKI_SURL_CONFIG_FILE} \
|
||||
&& echo -e "${MEDIAWIKI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/mediawiki \
|
||||
&& chmod a+x /etc/init.d/mediawiki \
|
||||
&& ln -s /etc/init.d/mediawiki /etc/rcD.d/S40mediawiki
|
||||
|
||||
|
||||
@ -5,9 +5,10 @@ Welcome to Rx3-Docker/MediaWiki docker image!
|
||||
This project aims to build a MediaWiki docker image.
|
||||
|
||||
Features:
|
||||
- Curtently based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/postgresql:1.1.4-mga9 images,
|
||||
- Curtently based on rx3-docker/php-apache:1.6.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images,
|
||||
- Sync with MediaWiki 1.43.5,
|
||||
- Auth_remoteuser extension included.
|
||||
- Auth_remoteuser extension included,
|
||||
- Support short URL.
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/11/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add short URL support,
|
||||
- Based on rx3-docker/php-apache:1.6.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/24
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -70,8 +70,8 @@ services:
|
||||
APACHE_GID: ${WA_GROUP_ID}
|
||||
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
|
||||
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
|
||||
WIKIMEDIA_CONFIG: ${WA_WIKIMEDIA_CONFIG}
|
||||
WIKIMEDIA_PATH: ${WA_WIKIMEDIA_PATH}
|
||||
MEDIAWIKI_CONFIG: ${WA_MEDIAWIKI_CONFIG}
|
||||
MEDIAWIKI_URL: ${WA_MEDIAWIKI_URL}
|
||||
|
||||
volumes:
|
||||
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
||||
|
||||
12
env.dist
12
env.dist
@ -20,7 +20,7 @@ APPL_NAME="mediawiki"
|
||||
APPL_NAME_FULL="MediaWiki Server"
|
||||
APPL_NAME_SHORT="mediawk"
|
||||
APPL_ORG="rx3-docker"
|
||||
APPL_VERSION="1.0.0"
|
||||
APPL_VERSION="1.1.0"
|
||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
@ -74,9 +74,9 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
|
||||
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
|
||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||
|
||||
docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.4-mga9 - - - postgres - - 5432 - - postgres postgres
|
||||
docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.5-mga9 - - - postgres - - 5432 - - postgres postgres
|
||||
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} mediawiki "Rx3-Docker/MediaWiki" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.5.4-mga9 - - 8076 80 - - apache apache
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} mediawiki "Rx3-Docker/MediaWiki" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.6.0-mga9 - - 8076 80 - - apache apache
|
||||
|
||||
|
||||
|
||||
@ -114,8 +114,8 @@ WA_IMG_INT=/var/www/${APPL_NAME}/images
|
||||
WA_TRASH_EXT=./var/lib/mediawiki/trash
|
||||
WA_TRASH_INT=/var/www/${APPL_NAME}/trash
|
||||
|
||||
#docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref
|
||||
#docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref
|
||||
|
||||
WA_WIKIMEDIA_CONFIG="TRUE"
|
||||
WA_WIKIMEDIA_PATH="/mediawiki"
|
||||
WA_MEDIAWIKI_CONFIG="TRUE"
|
||||
WA_MEDIAWIKI_URL="/mediawiki"
|
||||
#WA_SMTP_SERVER="mail.rx3.net"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user