femiwiki: Use luaSandbox (#861)

femiwiki · Aug 2, 2024 · 8831963 · 8831963
1 parent 0b4effe
commit 8831963
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/dockers/femiwiki/Dockerfile b/dockers/femiwiki/Dockerfile
@@ -10,7 +10,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/caddy:1.0.0 AS caddy
 
 FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/femiwiki-extensions:1.5.2 AS extensions
 
-FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/mediawiki:3.0.0
+FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/mediawiki:3.1.0
 
 # Set timezone
 ENV TZ=Asia/Seoul

diff --git a/dockers/femiwiki/LocalSettings.php b/dockers/femiwiki/LocalSettings.php
@@ -797,11 +797,9 @@
 
 // Scribunto
 wfLoadExtension( 'Scribunto' );
-$wgScribuntoDefaultEngine = 'luastandalone';
-if ( php_uname( 'm' ) == 'aarch64' ) {
-	$wgScribuntoEngineConf['luastandalone']['luaPath'] = '/usr/bin/lua';
-}
-$wgScribuntoEngineConf['luastandalone']['cpuLimit'] = 3;
+$wgScribuntoDefaultEngine = 'luasandbox';
+$wgScribuntoEngineConf['luasandbox']['cpuLimit'] = 3;
+$wgScribuntoEngineConf['luasandbox']['memoryLimit'] = 10485760;
 
 // SecureLinkFixer
 wfLoadExtension( 'SecureLinkFixer' );

diff --git a/dockers/femiwiki/README.md b/dockers/femiwiki/README.md
@@ -1,5 +1,10 @@
 # femiwiki
 
+## v1.3.0
+
+- Bump femiwiki/mediawiki to v3.1.0
+- Use luaSandbox and set luastandalone
+
 ## v1.2.3
 
 - Bump femiwiki/femiwiki-extensions to v1.5.2