- Add ISL support,
- Use now rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Rebuild for updates.
This commit is contained in:
@@ -9,11 +9,12 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
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 HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d
|
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_CORE_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-mediawiki-core.conf
|
||||||
@@ -45,6 +46,8 @@ sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g" '${MEDIAWIKI_SURL
|
|||||||
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\
|
ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration \n\
|
||||||
\n\
|
\n\
|
||||||
@@ -63,7 +66,8 @@ RewriteRule "^/?MEDIAWIKI_URL(/.*)?$" "/usr/share/mediawiki/index.php" [L,QSA]
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi.update -a \
|
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||||
|
&& 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 \
|
||||||
&& mv /etc/httpd/conf/sites.d/mediawiki.conf ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
|
&& mv /etc/httpd/conf/sites.d/mediawiki.conf ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
|
||||||
&& sed -i -e "s%Alias /mediawiki%Alias MEDIAWIKI_URL%" -e "s/Require local/Require MEDIAWIKI_CONFIG_AUTH/" ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
|
&& sed -i -e "s%Alias /mediawiki%Alias MEDIAWIKI_URL%" -e "s/Require local/Require MEDIAWIKI_CONFIG_AUTH/" ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ 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.6.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images,
|
- Curtently based on rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/postgresql:1.1.6-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.
|
- Support short URL.
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/MediaWiki V 1.1.1 - A. GIBERT - 2026/02/16
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add ISL support,
|
||||||
|
- Use now rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/postgresql:1.1.6-mga9 images,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/12/02
|
Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/12/02
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${WA_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${WA_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${WA_IMG_VERSION}
|
IMG_VERSION: ${WA_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
||||||
|
IMG_URL: ${WA_IMG_URL}
|
||||||
IMG_FROM_URL: ${WA_IMG_FROM_URL}
|
IMG_FROM_URL: ${WA_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
6
env.dist
6
env.dist
@@ -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.1.0"
|
APPL_VERSION="1.1.1"
|
||||||
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.5-mga9 - - - postgres - - 5432 - - postgres postgres
|
docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.6-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.6.0-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.2-mga9 - - 8076 80 - - apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user