From e7d326c15d7f6ed9bdf1fbb6a334e838d0d14cd5 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 22 Nov 2025 10:14:42 +0100 Subject: [PATCH] - Now use the mediawiki rx3 rpm. --- Dockerfile | 20 ++++++++------------ ReadMe.txt | 2 +- ReleaseNotes.txt | 5 +++-- env.dist | 8 ++++---- var/lib/mediawiki/images/.htaccess | 10 ---------- 5 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 var/lib/mediawiki/images/.htaccess diff --git a/Dockerfile b/Dockerfile index fe27aba..effd1b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,7 @@ ARG IMG_MAINTAINER 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 MEDIAWIKI_VERSION=1.43.5 @@ -33,13 +31,11 @@ sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' -RUN urpmi.update -a \ - && urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd git \ - && wget -q -O - https://releases.wikimedia.org/mediawiki/1.43/mediawiki-${MEDIAWIKI_VERSION}.tar.gz | tar xzvf - -C /var/www/html \ - && mv /var/www/html/mediawiki-${MEDIAWIKI_VERSION} /var/www/html/mediawiki \ - && ln -s /var/www/html/mediawiki/config/LocalSettings.php /var/www/html/mediawiki \ - && chown -R root:root /var/www \ - && chmod -R 775 /var/www \ - && 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 git mediawiki mediawiki-pgsql \ + && sed -i "s/Require local/Require all granted/" /etc/httpd/conf/webapps.d/mediawiki.conf \ + && chown -R root:root /var/www \ + && chmod -R 775 /var/www \ + && 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 diff --git a/ReadMe.txt b/ReadMe.txt index 74b8332..46febda 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -16,4 +16,4 @@ Your Rx3 Team. -- arnaud@rx3.net -https://git.rx3.org/gitea/rx3-docker/mantisbt +https://git.rx3.org/gitea/rx3-docker/mediawiki diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 8a38428..3101e21 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,7 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/18 +Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/22 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Use based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/postgresql:1.1.4-mga9 images. +- Based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/postgresql:1.1.4-mga9 images, +- Use mediawiki 1.43.5 from Rx3 rpm. diff --git a/env.dist b/env.dist index 8d3c041..c2d8866 100644 --- a/env.dist +++ b/env.dist @@ -76,7 +76,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.4-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 - - 8070 80 - - apache apache +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 @@ -106,13 +106,13 @@ WA_LOG_HTTPD_EXT="./var/log/httpd-webapp" WA_LOG_HTTPD_INT="/var/log/httpd" WA_CONF_EXT=./etc/${APPL_NAME} -WA_CONF_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/config +WA_CONF_INT=/etc/${APPL_NAME} WA_IMG_EXT=./var/lib/mediawiki/images -WA_IMG_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/images +WA_IMG_INT=/var/www/${APPL_NAME}/images WA_TRASH_EXT=./var/lib/mediawiki/trash -WA_TRASH_INT=/var/www/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 diff --git a/var/lib/mediawiki/images/.htaccess b/var/lib/mediawiki/images/.htaccess deleted file mode 100644 index e96e113..0000000 --- a/var/lib/mediawiki/images/.htaccess +++ /dev/null @@ -1,10 +0,0 @@ - -Header set X-Content-Type-Options nosniff - - -php_flag engine off - -# In php8, php dropped the version number. - -php_flag engine off -