From 847318711955550190bce49ac47e148b9cc233d0 Mon Sep 17 00:00:00 2001 From: conradschulz Date: Thu, 6 May 2021 16:25:08 +0200 Subject: [PATCH] Update for new Extensions everything works but maps still makes problems cant visualy edit --- dockerfile | 41 +++++++++++++++++++++++++++++++-------- example.LocalSettings.php | 14 +++++++++---- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dockerfile b/dockerfile index 8a2422a..2503f83 100644 --- a/dockerfile +++ b/dockerfile @@ -3,23 +3,48 @@ FROM mediawiki:lts RUN apt update && apt install -y xpdf # Eventually you need tu build ghostscript from source - RUN apt install -y ghostscript # Eventually you need tu build Imagick from source - RUN apt install -y imagemagick # ffmpeg für video support - RUN apt install -y ffmpeg -# Install Dependencies for Maps support +# Install Dependencies for Score Extension +########################################### +# Music Notation Framework LilyPond +RUN apt install -y lilypond +# Sandboxing system +RUN apt install -y firejail +# A SoundFont Synthesizer +RUN apt install -y fluidsynth -#RUN curl https://getcomposer.org/composer-2.phar > composer.phar && mv composer.phar /usr/local/bin/composer && chmod +x /usr/local/bin/composer -#RUN cd /var/www/html && COMPOSER=composer.local.json composer require --no-update mediawiki/maps:~8.0 -#RUN composer update -#RUN cd /var/www/html && composer update mediawiki/maps --no-dev -o -n +# Install composer for php dependencies +####################################### +RUN curl https://getcomposer.org/composer-2.phar > composer.phar && mv composer.phar /usr/local/bin/composer && chmod +x /usr/local/bin/composer +RUN cd /var/www/html && COMPOSER=composer.local.json composer require --no-update mediawiki/maps:~8.0 + +############################################################ +############################################################ +# This needs to be done in running Container +# It is possible to override entrypoint for container to run this as a skript but not done jet +# Install TimedMediaExtension dependencies +########################################### + +#RUN cd /var/www/html/extensions/TimedMediaHandler && composer update +#RUN cd /var/www/html/extensions/TimedMediaHandler && composer update mediawiki/maps --no-dev -o + +# Install Dependencies for Maps support +######################################## + +#RUN cd /var/www/html/extensions/Maps && composer update +#RUN cd /var/www/html/extensions/Maps && composer update mediawiki/maps --no-dev -o +############################################################## +############################################################## + + +RUN cd /var/www/html # Start from the webserver neccessary or not? Test from 23.04.2021 -> not needed #CMD ["apache2-foreground"] \ No newline at end of file diff --git a/example.LocalSettings.php b/example.LocalSettings.php index 149b196..058b04c 100644 --- a/example.LocalSettings.php +++ b/example.LocalSettings.php @@ -308,9 +308,10 @@ wfLoadExtension( 'Graph' ); # composer update # composer update mediawiki/maps --no-dev -o # inside the wiki shell -#wfLoadExtension( 'Maps' ); -#$egMapsDefaultService = 'leaflet'; -#$egMapsDefaultGeoService = 'google'; +wfLoadExtension( 'Maps' ); +$egMapsDefaultService = 'leaflet'; +$egMapsMapWidth = 800; +$egMapsDefaultGeoService = 'leaflet'; # Adding Musical notation with score Notation ############################################# @@ -324,4 +325,9 @@ $wgScoreTrim = true; #$wgImageMagickConvertCommand = '/usr/bin/convert'; # already set for image upload $wgShellRestrictionMethod = 'firejail'; # For shell memory errors increase -#$wgMaxShellMemory = xxxx; \ No newline at end of file +#$wgMaxShellMemory = xxxx; + +# Timedmedia Extension needed for Score and Video Support +wfLoadExtension( 'TimedMediaHandler' ); +#$wgFFmpegLocation = '/usr/bin/ffmpeg'; # already set under embedvideo +#$wgMaxShellMemory = xxxx; # For performance issuse \ No newline at end of file