From 665de8b1fc91bf8be22b9a43517d3bfac8042faf Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Mon, 7 Sep 2020 21:09:46 +0200 Subject: [PATCH] [BROKEN] Progress towards running install.php --- LocalSettings.php => LocalSettings.php.tmpl | 0 compose.yml | 7 ++--- entrypoint.sh | 29 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) rename LocalSettings.php => LocalSettings.php.tmpl (100%) create mode 100644 entrypoint.sh diff --git a/LocalSettings.php b/LocalSettings.php.tmpl similarity index 100% rename from LocalSettings.php rename to LocalSettings.php.tmpl diff --git a/compose.yml b/compose.yml index 4100baa..df5d2bd 100644 --- a/compose.yml +++ b/compose.yml @@ -32,7 +32,7 @@ services: - MEDIAWIKI_SITENAME=${MEDIAWIKI_SITENAME} - MEDIAWIKI_SITENAMESPACE=${MEDIAWIKI_SITENAMESPACE} volumes: - - 'mediawiki:/var/www/html' + - 'mediawiki_images:/var/www/html/images' - 'parsoid:/usr/lib/parsoid' configs: - source: LocalSettings_conf @@ -53,10 +53,11 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" + entrypoint: ./entrypoint.sh volumes: mariadb: - mediawiki: + mediawiki_images: parsoid: networks: @@ -75,5 +76,5 @@ secrets: configs: LocalSettings_conf: name: ${STACK_NAME}_local_settings_${LOCAL_SETTINGS_CONF_VERSION} - file: LocalSettings.php + file: LocalSettings.php.tmpl template_driver: golang diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..d417adc --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +set -eu -o pipefail + +run_install() { + set -eu + + php /var/www/html/maintenance/install.php + --server ${DOMAIN} + --dbuser mediawiki + --dbpass `cat /run/secrets/db_password` + --dbserver mariadb + --confpath /var/www/html/ + --dbname mediawiki + --pass `cat /run/secrets/admin_password` + --scriptpath '' + '${MEDIAWIKI_SITENAME}' + Admin +} + +main() { + set -eu + + run_install +} + +main + +/docker-entrypoint "$@"