From 3630422119f2c89b78d2b99e953973ef3a32c904 Mon Sep 17 00:00:00 2001
From: lens0021 <lorentz0021@gmail.com>
Date: Thu, 1 Aug 2024 16:33:42 +0000
Subject: [PATCH] php: Install wikidiff2 and luasandbox

---
 .github/workflows/docker-php-fpm.yml |  2 +-
 dockers/php-fpm/Dockerfile           | 19 ++++++++++++-------
 dockers/php-fpm/README.md            |  4 ++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-php-fpm.yml b/.github/workflows/docker-php-fpm.yml
index a79ae9a8..5608b36f 100644
--- a/.github/workflows/docker-php-fpm.yml
+++ b/.github/workflows/docker-php-fpm.yml
@@ -1,7 +1,7 @@
 name: 'Docker: php-fpm'
 
 env:
-  TAG: '1.1.0'
+  TAG: '1.2.0'
 
 on:
   push:
diff --git a/dockers/php-fpm/Dockerfile b/dockers/php-fpm/Dockerfile
index ed33dd43..12c637f2 100644
--- a/dockers/php-fpm/Dockerfile
+++ b/dockers/php-fpm/Dockerfile
@@ -19,15 +19,12 @@ RUN apt-get update && apt-get install -y \
       git \
       # Required for SyntaxHighlighting
       python3 \
-      # Required for Scribunto when the machine is on aarch64 architecture
-      # Only 5.1.x is supported
-      #   Reference: https://www.mediawiki.org/wiki/Extension:Scribunto#Additional_binaries
-      lua5.1 \
       # CLI utilities
       cron \
       sudo \
       # https://getcomposer.org/doc/00-intro.md#system-requirements
-      unzip
+      unzip \
+      ;
 
 # See https://caddyserver.com/docs/conventions#file-locations for details
 ENV XDG_CONFIG_HOME /config
@@ -35,11 +32,19 @@ ENV XDG_DATA_HOME /data
 
 # Install the PHP extensions we need
 RUN docker-php-ext-install -j8 \
+    calendar \
+    intl \
     mysqli \
     opcache \
-    intl \
     sockets \
-    calendar
+    ;
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN install-php-extensions \
+    # Required by Scribunto
+    luasandbox \
+    wikidiff2 \
+    ;
 
 # Install the default object cache
 RUN pecl channel-update pecl.php.net
diff --git a/dockers/php-fpm/README.md b/dockers/php-fpm/README.md
index 9fb03d83..29629bcc 100644
--- a/dockers/php-fpm/README.md
+++ b/dockers/php-fpm/README.md
@@ -2,6 +2,10 @@
 
 미디어위키 실행에 필요한 각종 PHP 디펜던시들을 설치한다.
 
+## v1.2.0
+
+- Add more php extensions: wikidiff2 and luasandbox
+
 ## v1.1.0
 
 - Include Composer