- 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_VERSION
|
||||
ARG IMG_MAINTAINER
|
||||
ARG IMG_URL
|
||||
|
||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||
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
|
||||
LABEL maintainer=${IMG_MAINTAINER}
|
||||
|
||||
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
|
||||
@@ -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'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration \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 \
|
||||
&& 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 \
|
||||
|
||||
Reference in New Issue
Block a user