From a5f5bdf929191d0e715cf22ad6a610f57c434ff8 Mon Sep 17 00:00:00 2001 From: lens0021 Date: Tue, 21 May 2024 18:14:11 +0900 Subject: [PATCH] fix: Embed LocalSettings.php in femiwiki image --- .github/workflows/docker-femiwiki.yml | 2 +- dockers/femiwiki/Dockerfile | 2 ++ dockers/{mediawiki => femiwiki}/LocalSettings.php | 0 dockers/femiwiki/README.md | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) rename dockers/{mediawiki => femiwiki}/LocalSettings.php (100%) diff --git a/.github/workflows/docker-femiwiki.yml b/.github/workflows/docker-femiwiki.yml index 5b755542..8d5b8772 100644 --- a/.github/workflows/docker-femiwiki.yml +++ b/.github/workflows/docker-femiwiki.yml @@ -24,7 +24,7 @@ jobs: - name: Edit configuration run: | mv development/secret.php.example development/secret.php - mv dockers/mediawiki/LocalSettings.php development + mv dockers/femiwiki/LocalSettings.php development mv dockers/femiwiki/Hotfix.php development sed -i -r 's~ghcr\.io\/femiwiki\/mediawiki:.+~ghcr\.io\/femiwiki\/mediawiki:docker-test~' docker-compose.yml diff --git a/dockers/femiwiki/Dockerfile b/dockers/femiwiki/Dockerfile index 6ff62393..5938fdd7 100644 --- a/dockers/femiwiki/Dockerfile +++ b/dockers/femiwiki/Dockerfile @@ -46,6 +46,8 @@ COPY --chown=www-data:www-data resources /srv/femiwiki.com/ COPY --chown=www-data:www-data ["site-list.xml", "Hotfix.php", "/a/"] RUN mkdir /mediawiki/ +COPY --chown=www-data LocalSettings.php /a/ + EXPOSE 80 EXPOSE 443 EXPOSE 9000 diff --git a/dockers/mediawiki/LocalSettings.php b/dockers/femiwiki/LocalSettings.php similarity index 100% rename from dockers/mediawiki/LocalSettings.php rename to dockers/femiwiki/LocalSettings.php diff --git a/dockers/femiwiki/README.md b/dockers/femiwiki/README.md index 3878c520..60f85d94 100644 --- a/dockers/femiwiki/README.md +++ b/dockers/femiwiki/README.md @@ -5,6 +5,7 @@ - Bump femiwiki/mediawiki to v2.0.0 - Run Composer - Download extensions from femiwiki/femiwiki-extensions v1.1.1 +- Embed LocalSettings.php in this image ## v1.1.0