5 Commits
mw_32 ... mw_33

Author SHA1 Message Date
469c64490c add missing comment id fields (that were probably supposed to be added by a migration we skipped)
These fields exist in the live database so migration should still work there.
2019-07-06 00:49:32 -05:00
5c0a6dfd6d Merge branch 'master' into mw_33 2019-07-06 00:17:54 -05:00
ade6a6d415 update database dump with 1.32 dump 2019-07-06 00:17:38 -05:00
e020b4cc3f add wait-for-it 2019-07-02 20:11:42 -05:00
b2a5879743 update to mediawiki 1.33.0 2019-07-02 19:09:17 -05:00
3 changed files with 309 additions and 121 deletions

View File

@ -4,8 +4,8 @@ RUN apt-get -y update && apt-get -y install nginx php-fpm php-mysql php-apcu php
mysql-client imagemagick curl wget zip unzip php-pclzip git msmtp msmtp-mta
RUN pip install supervisor-stdout
ENV MW_VERSION REL1_32
ENV MW_SOURCE https://releases.wikimedia.org/mediawiki/1.32/mediawiki-1.32.1.tar.gz
ENV MW_VERSION REL1_33
ENV MW_SOURCE https://releases.wikimedia.org/mediawiki/1.33/mediawiki-1.33.0.tar.gz
ENV SMF_VERSION 2.0.15
ENV SMF_SOURCE https://download.simplemachines.org/index.php/smf_2-0-15_install.tar.gz
@ -59,6 +59,9 @@ RUN ln -sf /configuration/supervisord.conf /etc/supervisor/supervisord.conf && \
ln -sf /configuration/php-fpm-pool.conf /etc/php/7.0/fpm/pool.d/www.conf && \
ln -sf /configuration/php.ini /etc/php/7.0/fpm/php.ini
ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /usr/bin/wait-for-it
RUN chmod +x /usr/bin/wait-for-it
EXPOSE 80
CMD /usr/bin/supervisord -n

File diff suppressed because one or more lines are too long

View File

@ -35,6 +35,7 @@ sed -i "s/@GCL_SMTP_USER@/$GCL_SMTP_USER/g" /etc/msmtprc
sed -i "s/@GCL_SMTP_PASSWORD@/$GCL_SMTP_PASSWORD/g" /etc/msmtprc
# Run maintenance scripts
wait-for-it "$GCL_DB_HOST:3306" --timeout=60
cd $WIKI_SOURCE/maintenance
php update.php