d2a8c94d6b
Injecting it does nothing other than break the wiki with 404 errors. The only thing that uses it is the install.sh script, which then one-time substitutes it in LocalSettings.php. It isn't used by the mount logic for /var/www/w, and it isn't used by the Apache config in the referenced Docker images either. While the injection is removed, I have kept the following two: 1. It is still set for the docker images so that the env variable can still be read, to allow new additions to the dev images to not have to hardcode it, and to perhaps one day actually support this. It seems useful to retain as abstraction layer from that perspective. 2. It is still part of the recommended `.env` file. For the same reason as the previous point, but not theoretical. Our test tools (Selenium, QUnit, fresh-node, etc.) all expect this env variable for discovery and those tools are not specific to MediaWiki-Docker so they need this indeed. After this change, there remains one weak link, which is someone copying the recommended .env file and then deciding to change MW_SCRIPT_PATH for some reason. What will happen is that the wiki continues to work and identify with "/w", and the only impact is that external tooling will look for their custom path, and not find a wiki there. Bug: T273529 Change-Id: I4aa71f8994810ea0fbe2950958097c223c88916c
51 lines
1.6 KiB
YAML
51 lines
1.6 KiB
YAML
# Please see DEVELOPERS.md for help
|
|
#
|
|
# Contributions to this file are welcome but please note that this file is
|
|
# minimal by design, with the idea to make it easily extensible via
|
|
# docker-compose.override.yml. For help with doing that, please see
|
|
# DEVELOPERS.md
|
|
version: '3.7'
|
|
services:
|
|
mediawiki:
|
|
image: docker-registry.wikimedia.org/dev/buster-php72-fpm:1.0.0
|
|
user: "${MW_DOCKER_UID}:${MW_DOCKER_GID}"
|
|
volumes:
|
|
- ./:/var/www/html/w:cached
|
|
env_file:
|
|
- '.env'
|
|
environment:
|
|
COMPOSER_CACHE_DIR: '/var/www/html/w/cache/composer'
|
|
MW_SERVER: 'http://localhost:${MW_DOCKER_PORT:-8080}'
|
|
MW_SCRIPT_PATH: '/w'
|
|
MW_DBPATH: '/var/www/html/w/cache/sqlite'
|
|
MW_DBTYPE: 'sqlite'
|
|
MW_LANG: 'en'
|
|
MW_USER: '${MEDIAWIKI_USER:-Admin}'
|
|
MW_PASS: '${MEDIAWIKI_PASSWORD:-dockerpass}'
|
|
MW_SITENAME: 'MediaWiki'
|
|
MW_LOG_DIR: /var/www/html/w/cache
|
|
XDEBUG_CONFIG: '${XDEBUG_CONFIG}'
|
|
XDEBUG_ENABLE: '${XDEBUG_ENABLE:-true}'
|
|
XHPROF_ENABLE: '${XHPROF_ENABLE:-true}'
|
|
|
|
mediawiki-web:
|
|
image: docker-registry.wikimedia.org/dev/buster-apache2:1.0.0
|
|
user: "${MW_DOCKER_UID}:${MW_DOCKER_GID}"
|
|
ports:
|
|
- "${MW_DOCKER_PORT:-8080}:8080"
|
|
volumes:
|
|
- ./:/var/www/html/w:cached
|
|
env_file:
|
|
- '.env'
|
|
environment:
|
|
MW_LOG_DIR: /var/www/html/w/cache
|
|
mediawiki-jobrunner:
|
|
image: docker-registry.wikimedia.org/dev/buster-php72-jobrunner:1.0.0
|
|
user: "${MW_DOCKER_UID}:${MW_DOCKER_GID}"
|
|
volumes:
|
|
- ./:/var/www/html/w:cached
|
|
env_file:
|
|
- '.env'
|
|
environment:
|
|
MW_LOG_DIR: /var/www/html/w/cache
|
|
MW_INSTALL_PATH: /var/www/html/w
|