Switch to official Mediawiki image + update to 1.35
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Closes #4, #8
This commit is contained in:
parent
db6595c52c
commit
f05d45ee52
|
@ -151,7 +151,7 @@ $wgVisualEditorAllowLossySwitching = false;
|
|||
|
||||
$wgVirtualRestConfig['modules']['parsoid'] = [
|
||||
// URL to the Parsoid instance - use port 8142 if you use the Debian package - the parameter 'URL' was first used but is now deprecated (string)
|
||||
'url' => 'http://localhost:8000/',
|
||||
'url' => 'http://parsoid:8000/',
|
||||
// Parsoid "domain" (string, optional) - MediaWiki >= 1.26
|
||||
'domain' => 'localhost',
|
||||
// Parsoid "prefix" (string, optional) - deprecated since MediaWiki 1.26, use 'domain'
|
||||
|
|
13
compose.yml
13
compose.yml
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||
|
||||
services:
|
||||
app:
|
||||
image: "revianlabs/mediawiki-ve-bundle"
|
||||
image: mediawiki:1.35.0
|
||||
environment:
|
||||
- DOMAIN
|
||||
- STACK_NAME
|
||||
|
@ -46,9 +46,6 @@ services:
|
|||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||
entrypoint: /docker-entrypoint2.sh
|
||||
|
||||
db:
|
||||
|
@ -72,6 +69,14 @@ services:
|
|||
max_attempts: 3
|
||||
window: 120s
|
||||
|
||||
parsoid:
|
||||
image: thenets/parsoid:0.9.0
|
||||
hostname: parsoidserver
|
||||
networks:
|
||||
- internal
|
||||
environment:
|
||||
PARSOID_DOMAIN_localhost: http://app:80/api.php
|
||||
|
||||
volumes:
|
||||
mariadb:
|
||||
mediawiki_images:
|
||||
|
|
|
@ -87,4 +87,4 @@ main() {
|
|||
|
||||
main
|
||||
|
||||
/docker-entrypoint.sh apache2-foreground "$@"
|
||||
apache2-foreground
|
||||
|
|
Reference in New Issue