diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2020-04-01 16:16:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2020-04-01 16:16:30 +0000 |
| commit | 28f959c5ca9444b844b7150124897b30f95007af (patch) | |
| tree | b07b353e0d7e5cbf7905b1adf70971e5c8560a38 /docker-compose.yml | |
| parent | baabeb458fc159a0c6b196b62d5601b93adc90b5 (diff) | |
| parent | c27eda79a09addf57d830b8021e8f7d148a0f9f7 (diff) | |
| download | mediawikicore-28f959c5ca9444b844b7150124897b30f95007af.tar.gz mediawikicore-28f959c5ca9444b844b7150124897b30f95007af.zip | |
Merge "[docker] Use a .env file for setting the port and user"
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index d7a3bfa9d871..162b89664434 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,12 @@ services: mediawiki: image: docker-registry.wikimedia.org/dev/stretch-php72-fpm-apache2-xdebug:0.1.1 ports: - - "8080:8080" + - "${MW_DOCKER_PORT:-8080}:8080" volumes: - ./:/var/www/html:cached environment: COMPOSER_CACHE_DIR: '/var/www/html/cache/composer' - MW_SERVER: 'http://localhost:8080' + MW_SERVER: 'http://localhost:${MW_DOCKER_PORT:-8080}' MW_SCRIPT_PATH: '' MW_DBPATH: '/var/www/html/cache/sqlite' MW_DBTYPE: 'sqlite' @@ -23,3 +23,4 @@ services: MW_PASS: 'dockerpass' MW_SITENAME: 'MediaWiki' MW_LOG_DIR: /var/www/html/cache + XDEBUG_CONFIG: ${XDEBUG_CONFIG} |