6 Commits

Author SHA1 Message Date
4ea40c091e Merge branch 'stupid-goddamn-mysql'
* stupid-goddamn-mysql:
  fix stupid goddamn mysql secret volume
2026-04-21 11:33:36 -07:00
7f61795ad9 fix stupid goddamn mysql secret volume 2026-04-21 11:33:24 -07:00
6e52b56302 Merge branch 'optimize-mw-dockerfile'
* optimize-mw-dockerfile:
  fix d-mediawiki dockerfile
2026-04-21 11:01:03 -07:00
8926e6c33b Merge branch 'gitea-actions'
* gitea-actions:
  remove unused data vol
  fix networking issues in gitea action runner
  fix stupid volume issue
  upgrade mediawiki (AGAIN)
  pod-charlesreid1 service: stdout journal
  remove endless tex packages from mw Dockerfile
  fix edit box style
  add runner config dir
  add gitea runner config
  get gitea container set up for gitea actions
2026-04-21 11:00:54 -07:00
e5b56493e8 fix d-mediawiki dockerfile 2026-04-21 10:58:46 -07:00
3ec56cb967 remove unused data vol 2026-04-19 23:04:02 -07:00
3 changed files with 6 additions and 16 deletions

View File

@@ -5,7 +5,7 @@ EXPOSE 8989
# Install ImageMagick (used for image thumbnailing) # Install ImageMagick (used for image thumbnailing)
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y imagemagick && \ apt-get install -y --no-install-recommends imagemagick && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Copy skins, config files, and other particulars into container # Copy skins, config files, and other particulars into container
@@ -24,28 +24,25 @@ RUN apt-get update && \
COPY charlesreid1-config/mediawiki/extensions/Math /var/www/html/extensions/Math COPY charlesreid1-config/mediawiki/extensions/Math /var/www/html/extensions/Math
COPY charlesreid1-config/mediawiki/extensions/ParserFunctions /var/www/html/extensions/ParserFunctions COPY charlesreid1-config/mediawiki/extensions/ParserFunctions /var/www/html/extensions/ParserFunctions
COPY charlesreid1-config/mediawiki/extensions/SyntaxHighlight_GeSHi /var/www/html/extensions/SyntaxHighlight_GeSHi COPY charlesreid1-config/mediawiki/extensions/SyntaxHighlight_GeSHi /var/www/html/extensions/SyntaxHighlight_GeSHi
RUN chown -R www-data:www-data /var/www/html/*
# Skins # Skins
COPY charlesreid1-config/mediawiki/skins /var/www/html/skins COPY charlesreid1-config/mediawiki/skins /var/www/html/skins
RUN chown -R www-data:www-data /var/www/html/skins
RUN touch /var/www/html/skins
# MathJax 3.2.2 (self-hosted, served via Apache alias at /w/mathjax/*). # MathJax 3.2.2 (self-hosted, served via Apache alias at /w/mathjax/*).
# Math extension runs in 'source' mode; MathJax renders client-side, so we # Math extension runs in 'source' mode; MathJax renders client-side, so we
# never call out to restbase/mathoid. See LocalSettings.php.j2. # never call out to restbase/mathoid. See LocalSettings.php.j2.
COPY charlesreid1-config/mediawiki/mathjax /var/www/html/mathjax COPY charlesreid1-config/mediawiki/mathjax /var/www/html/mathjax
RUN chown -R www-data:www-data /var/www/html/mathjax
# Settings # Settings
COPY charlesreid1-config/mediawiki/LocalSettings.php /var/www/html/LocalSettings.php COPY charlesreid1-config/mediawiki/LocalSettings.php /var/www/html/LocalSettings.php
RUN chown -R www-data:www-data /var/www/html/LocalSettings*
RUN chmod 600 /var/www/html/LocalSettings.php
# Apache conf file # Apache conf file
COPY charlesreid1-config/apache/*.conf /etc/apache2/sites-enabled/ COPY charlesreid1-config/apache/*.conf /etc/apache2/sites-enabled/
RUN a2enmod rewrite
RUN service apache2 restart RUN chown -R www-data:www-data /var/www/html/* /var/www/html/skins /var/www/html/mathjax /var/www/html/LocalSettings* && \
touch /var/www/html/skins && \
chmod 600 /var/www/html/LocalSettings.php && \
a2enmod rewrite
# PHP conf file # PHP conf file
# https://hub.docker.com/_/php/ # https://hub.docker.com/_/php/

View File

@@ -1,7 +1,2 @@
FROM mysql:8.0 FROM mysql:8.0
MAINTAINER charles@charlesreid1.com MAINTAINER charles@charlesreid1.com
# make mysql data a volume
VOLUME ["/var/lib/mysql"]
RUN chown mysql:mysql /var/lib/mysql

View File

@@ -132,8 +132,6 @@ volumes:
stormy_mysql_data: stormy_mysql_data:
stormy_mw_images: stormy_mw_images:
external: true external: true
stormy_mw_data:
external: true
stormy_gitea_data: stormy_gitea_data:
stormy_gitea_runner_data: stormy_gitea_runner_data:
stormy_nginx_logs: stormy_nginx_logs: