Rx3-Docker/mediawiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Compare commits

base: Rx3-Docker:mediawiki-1.0.0
Branches Tags
Rx3-Docker:master
Rx3-Docker:mediawiki-1.1.0
Rx3-Docker:mediawiki-1.0.0
...
compare: Rx3-Docker:master
Branches Tags
Rx3-Docker:master
Rx3-Docker:mediawiki-1.1.0
Rx3-Docker:mediawiki-1.0.0

4 Commits
mediawiki- ... master

Author SHA1 Message Date
Arnaud G. GIBERT
a4ffd0e076 - Fix Release date for rebuild with last php-apache update. 2025-12-02 15:40:55 +01:00
Arnaud G. GIBERT
a90e0dc922 - Fix broken Dockerfile! 2025-11-29 10:18:41 +01:00
Arnaud G. GIBERT
aec9b892af - Now use .ref config file, 
- Fix short URL with non /mediawiki URL.
 2025-11-29 10:10:00 +01:00
Arnaud G. GIBERT
10e422c206 - Add short URL support, 
- Based on rx3-docker/php-apache:1.6.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images.
 2025-11-28 20:24:28 +01:00
5 changed files with 61 additions and 22 deletions
Show Stats Expand all files Collapse all files

53
Dockerfile
View File

@ -15,31 +15,60 @@ LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}ARG MEDIAWIKI_VERSION=1.43.5 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
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
ARG MEDIAWIKI='#!/bin/bash \n\ ARG MEDIAWIKI='#!/bin/bash \n\
\n\ \n\
chown -R apache:apache /var/www/mediawiki /etc/mediawiki \n\ chown -R apache:apache /var/www/mediawiki /etc/mediawiki \n\
chmod -R a-x,a+X /var/www/mediawiki /etc/mediawiki \n\ chmod -R a-x,a+X /var/www/mediawiki /etc/mediawiki \n\
chmod o-rwx /var/www/mediawiki /etc/mediawiki \n\ chmod o-rwx /var/www/mediawiki /etc/mediawiki \n\
chmod -R u+rwX /var/www/mediawiki \n\ chmod -R u+rwX /var/www/mediawiki \n\
\n\ \n\
if [[ "${WIKIMEDIA_CONFIG}" == "TRUE" ]] \n\ cp -f '${MEDIAWIKI_CORE_CONFIG_FILE}.ref' '${MEDIAWIKI_CORE_CONFIG_FILE}' \n\
cp -f '${MEDIAWIKI_SURL_CONFIG_FILE}.ref' '${MEDIAWIKI_SURL_CONFIG_FILE}' \n\
\n\
if [[ "${MEDIAWIKI_CONFIG}" == "TRUE" ]] \n\
then \n\ then \n\
sed -i "s/Require local/Require all granted/" /etc/httpd/conf/webapps.d/mediawiki.conf \n\ sed -i "s/MEDIAWIKI_CONFIG_AUTH/all granted/" '${MEDIAWIKI_CORE_CONFIG_FILE}' \n\
else \n\
sed -i "s/MEDIAWIKI_CONFIG_AUTH/local/" '${MEDIAWIKI_CORE_CONFIG_FILE}' \n\
fi \n\ fi \n\
\n\ \n\
sed -i -e "s%Alias /mediawiki%Alias ${WIKIMEDIA_PATH}%" /etc/httpd/conf/webapps.d/mediawiki.conf \n\ sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g" '${MEDIAWIKI_CORE_CONFIG_FILE}' \n\
sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g" '${MEDIAWIKI_SURL_CONFIG_FILE}' \n\
\n\ \n\
sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration \n\
\n\
# Eval the subquery \n\
RewriteCond %{REQUEST_URI} ^MEDIAWIKI_URL(.*)$ \n\
RewriteRule ^ - [E=SUBREQUEST_URI:%1] \n\
\n\
# Skip local file or dir \n\
RewriteCond /usr/share/mediawiki%{ENV:SUBREQUEST_URI} !-f \n\
RewriteCond /usr/share/mediawiki%{ENV:SUBREQUEST_URI} !-d \n\
\n\
# Rewite \n\
RewriteRule "^/?MEDIAWIKI_URL(/.*)?$" "/usr/share/mediawiki/index.php" [L,QSA] \n\
'
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
RUN urpmi.update -a \ RUN urpmi.update -a \
&& urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql \ && 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 \ && mv /etc/httpd/conf/sites.d/mediawiki.conf ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
&& chmod a+x /etc/init.d/mediawiki \ && sed -i -e "s%Alias /mediawiki%Alias MEDIAWIKI_URL%" -e "s/Require local/Require MEDIAWIKI_CONFIG_AUTH/" ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
&& echo -e "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${MEDIAWIKI_SURL_CONFIG_FILE}.ref \
&& 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 && ln -s /etc/init.d/mediawiki /etc/rcD.d/S40mediawiki

5
ReadMe.txt
View File

@ -5,9 +5,10 @@ Welcome to Rx3-Docker/MediaWiki docker image!
This project aims to build a MediaWiki docker image. This project aims to build a MediaWiki docker image.
Features: 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, - Sync with MediaWiki 1.43.5,
- Auth_remoteuser extension included. - Auth_remoteuser extension included,
- Support short URL.

9
ReleaseNotes.txt
View File

@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/12/02
------------------------------------------------------------------------------------------------------------------------------------
- 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 Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/24
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

4
compose.yaml
View File

@ -70,8 +70,8 @@ services:
APACHE_GID: ${WA_GROUP_ID} APACHE_GID: ${WA_GROUP_ID}
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
WIKIMEDIA_CONFIG: ${WA_WIKIMEDIA_CONFIG} MEDIAWIKI_CONFIG: ${WA_MEDIAWIKI_CONFIG}
WIKIMEDIA_PATH: ${WA_WIKIMEDIA_PATH} MEDIAWIKI_URL: ${WA_MEDIAWIKI_URL}
volumes: volumes:
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}

12
env.dist
View File

@ -20,7 +20,7 @@ APPL_NAME="mediawiki"
APPL_NAME_FULL="MediaWiki Server" APPL_NAME_FULL="MediaWiki Server"
APPL_NAME_SHORT="mediawk" APPL_NAME_SHORT="mediawk"
APPL_ORG="rx3-docker" APPL_ORG="rx3-docker"
APPL_VERSION="1.0.0" APPL_VERSION="1.1.0"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' 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 | # | 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_EXT=./var/lib/mediawiki/trash
WA_TRASH_INT=/var/www/${APPL_NAME}/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_MEDIAWIKI_CONFIG="TRUE"
WA_WIKIMEDIA_PATH="/mediawiki" WA_MEDIAWIKI_URL="/mediawiki"
#WA_SMTP_SERVER="mail.rx3.net" #WA_SMTP_SERVER="mail.rx3.net"