coop-cloud/mediawiki
coop-cloud
/
mediawiki
Archived
4
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Tweak DB initialisation
continuous-integration/drone/push Build is passing Details 

Fixes #21
This commit is contained in:
3wc 2021-02-17 18:21:51 +02:00
parent 5433215642
commit 4812fc9829
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.sample
View File

@ -1,7 +1,7 @@
TYPE=mediawiki TYPE=mediawiki
DOMAIN=wiki.example.com DOMAIN=mediawiki.example.com
## Domain aliases
#EXTRA_DOMAINS=', `www.wiki.example.com`' #EXTRA_DOMAINS=', `www.wiki.example.com`'
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production

2
abra.sh
View File

@ -1,6 +1,6 @@
export LOCAL_SETTINGS_CONF_VERSION=v1 export LOCAL_SETTINGS_CONF_VERSION=v1
export HTACCESS_CONF_VERSION=v1 export HTACCESS_CONF_VERSION=v1
export ENTRYPOINT_CONF_VERSION=v1 export ENTRYPOINT_CONF_VERSION=v2
export COMPOSER_LOCAL_CONF_VERSION=v1 export COMPOSER_LOCAL_CONF_VERSION=v1
export PHP_INI_VERSION=v1 export PHP_INI_VERSION=v1

24
entrypoint.sh.tmpl
View File

@ -5,22 +5,18 @@ set -eu -o pipefail
init_composer() { init_composer() {
set -eu set -eu
if [ -n "${OPENID_ENABLED-}" ]; then if ! type composer > /dev/null 2>&1; then
if ! type composer > /dev/null 2>&1; then apt update -yqq && apt install -yqq curl git unzip zip
apt update -yqq && apt install -yqq curl git unzip zip curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15 composer -V
composer -V
fi
fi fi
} }
composer_install() { composer_install() {
set -eu set -eu
if [ -n "${OPENID_ENABLED-}" ]; then cd /var/www/html/ && composer update && composer install
cd /var/www/html/ && composer update && composer install
fi
} }
init_db() { init_db() {
@ -39,8 +35,10 @@ init_db() {
TABLE_COUNT=$(mysql -u "${DB_USER}" --password="$PASSWORD" -h "${DB_HOST}" "${DB_NAME}" -e "SELECT count(*) AS TOTAL FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'mediawiki';" -N -B) TABLE_COUNT=$(mysql -u "${DB_USER}" --password="$PASSWORD" -h "${DB_HOST}" "${DB_NAME}" -e "SELECT count(*) AS TOTAL FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'mediawiki';" -N -B)
if [[ "${TABLE_COUNT}" == "0" ]]; then if [[ "${TABLE_COUNT}" == "0" ]]; then
php /var/www/html/maintenance/sql.php < /var/www/html/maintenance/tables.sql php /var/www/html/maintenance/generateSchemaSql.php
php /var/www/html/maintenance/sql.php < /var/www/html/maintenance/interwiki.sql php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables-generated.sql
php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables.sql
php /var/www/html/maintenance/sql.php /var/www/html/maintenance/interwiki.sql
# FIXME run createAndPromote.php with $ADMIN_USERNAME # FIXME run createAndPromote.php with $ADMIN_USERNAME
else else
php /var/www/html/maintenance/update.php --quick php /var/www/html/maintenance/update.php --quick
@ -79,9 +77,9 @@ main() {
set -eu set -eu
init_extensions init_extensions
init_db
init_composer init_composer
composer_install composer_install
init_db
} }
main main