diff --git a/Dockerfile b/Dockerfile index 0b58b73..20c9649 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,6 @@ 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 AUTH_REMOTEUSER_URL="https://extdist.wmflabs.org/dist/extensions/Auth_remoteuser-REL1_43-2c7c5be.tar.gz" - #--------------------------------------------------------------------------------------------------- @@ -39,10 +37,9 @@ 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 mediawiki mediawiki-pgsql \ - && wget -q -O - ${AUTH_REMOTEUSER_URL} | tar -xzvf - -C /usr/share/mediawiki/extensions \ - && chown -R root:root /usr/share/mediawiki/extensions \ - && 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 \ + && 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/ReleaseNotes.txt b/ReleaseNotes.txt index 2f768c0..a1a96b8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,7 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/23 +Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/24 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, - 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, -- Include Auth_remoteuser extension. +- Use mediawiki 1.43.5 (including Auth_remoteuser extension) from Rx3 rpm. diff --git a/var/lib/mediawiki/images/.gitignore b/var/lib/mediawiki/images/.gitignore deleted file mode 100644 index 556bc65..0000000 --- a/var/lib/mediawiki/images/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.old diff --git a/var/lib/mediawiki/images/README b/var/lib/mediawiki/images/README deleted file mode 100644 index e6d6c11..0000000 --- a/var/lib/mediawiki/images/README +++ /dev/null @@ -1,2 +0,0 @@ -If uploads are enabled in the wiki, files will be put in subdirectories -under here. diff --git a/var/lib/mediawiki/trash/.gitignore b/var/lib/mediawiki/trash/.gitignore deleted file mode 100644 index 5e7d273..0000000 --- a/var/lib/mediawiki/trash/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore