mediawiki-docker: Add a jobrunner container

- Uses new stretch-php72-jobrunner from dev-images

  - Removes TimedMediaHandler-specific resource limits from general
    DevelopmentSettings.php, as we're putting these in the container
    PlatformSettings.php from docker entrypoints.

Bug: T246935
Bug: T246942
Depends-On: I505366b287f75581a5dd8016abbedfe61f53cb13
Change-Id: I4b4061d9cd877af34606c914942cfe0be028fff8
This commit is contained in:
Brennen Bearnes 2020-05-21 12:44:58 -06:00 committed by Jforrester
parent 610f008b7a
commit c9efaadd00
2 changed files with 8 additions and 12 deletions

View file

@ -7,7 +7,7 @@
version: '3.7'
services:
mediawiki:
image: docker-registry.wikimedia.org/dev/stretch-php72-fpm-apache2-xdebug:0.3.0
image: docker-registry.wikimedia.org/dev/stretch-php72-fpm-apache2-xdebug:0.4.0
ports:
- "${MW_DOCKER_PORT:-8080}:8080"
volumes:
@ -24,3 +24,10 @@ services:
MW_SITENAME: 'MediaWiki'
MW_LOG_DIR: /var/www/html/cache
XDEBUG_CONFIG: ${XDEBUG_CONFIG}
mediawiki-jobrunner:
image: docker-registry.wikimedia.org/dev/stretch-php72-jobrunner:0.0.1
volumes:
- ./:/var/www/html:cached
environment:
MW_LOG_DIR: /var/www/html/cache
MW_INSTALL_PATH: /var/www/html

View file

@ -69,17 +69,6 @@ $wgEnableJavaScriptTest = true;
// Enable development/experimental endpoints
$wgRestAPIAdditionalRouteFiles = [ 'includes/Rest/coreDevelopmentRoutes.json' ];
// Disable resource limits
$wgMaxShellMemory = 0;
$wgMaxShellFileSize = 0;
$wgMaxShellTime = 0;
$wgMaxShellWallClockTime = 0;
// Disable resource limits for TimedMediaHandler
$wgTranscodeBackgroundTimeLimit = 0;
$wgTranscodeBackgroundMemoryLimit = 0;
$wgTranscodeBackgroundSizeLimit = 0;
/**
* Experimental changes that may later become the default.
* (Must reference a Phabricator ticket)