femiwiki/mediawiki 3.1.0 (#859)

* .github: Use version on README.md * mediawiki: Bump femiwiki/php-fpm to v1.2.0
femiwiki · Aug 2, 2024 · 05e7425 · 05e7425
1 parent a1cdc68
commit 05e7425
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/docker-mediawiki.yml b/.github/workflows/docker-mediawiki.yml
@@ -1,8 +1,5 @@
 name: 'Docker: mediawiki'
 
-env:
-  TAG: '3.0.0'
-
 on:
   push:
     paths:
@@ -31,6 +28,9 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - id: get-version
+        run: echo "ver=$(grep -m 1 '## ' dockers/mediawiki/README.md | cut -d' ' -f2)" >> $GITHUB_OUTPUT
+
       - uses: docker/build-push-action@v6
         with:
           context: '{{ defaultContext }}:dockers/mediawiki'
@@ -40,4 +40,4 @@ jobs:
           push: ${{ github.repository_owner == 'femiwiki' && github.ref == 'refs/heads/main' }}
           tags: |
             ghcr.io/femiwiki/mediawiki:latest
-            ghcr.io/femiwiki/mediawiki:${{ env.TAG }}
+            ghcr.io/femiwiki/mediawiki:${{ steps.get-version.outputs.ver }}
diff --git a/dockers/mediawiki/Dockerfile b/dockers/mediawiki/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/php-fpm:1.1.0
+FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/php-fpm:1.2.0
 ARG MEDIAWIKI_VERSION=1.42.1
 
 RUN mkdir /mediawiki/
@@ -12,10 +12,6 @@ RUN MEDIAWIKI_MAJOR_VERSION="$(echo $MEDIAWIKI_VERSION | cut -d. -f-2)" &&\
 # See https://www.mediawiki.org/wiki/Manual:$wgCacheDirectory for details
 RUN sudo -u www-data mkdir -p /tmp/file-cache /tmp/cache
 
-# Web server should be able to execute lua binary
-# Reference: https://www.mediawiki.org/wiki/Extension:Scribunto#Additional_binaries
-RUN chmod o+x /usr/bin/lua
-
 # Install and register cron
 COPY cron/crontab /tmp/crontab
 RUN crontab /tmp/crontab && rm /tmp/crontab

diff --git a/dockers/mediawiki/README.md b/dockers/mediawiki/README.md
@@ -1,24 +1,28 @@
 # docker-mediawiki
 
-## 3.0.0
+## v3.1.0
+
+- Bump femiwiki/php-fpm to v1.2.0
+
+## v3.0.0
 
 - Bump MediaWiki to v1.42.1
 
-## 2.0.1
+## v2.0.1
 
 - Do not embed LocalSettings.php
 
-## 2.0.0
+## v2.0.0
 
 - Remove extensions
 - Do not run Composer
 - Bump femiwiki/php-fpm to v1.1.0
 
-## 1.1.1
+## v1.1.1
 
 - Bump femiwiki-extensions to v1.1.1
 
-## 1.1.0
+## v1.1.0
 
 - Bump femiwiki-extensions to v1.1.0