Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

femiwiki: Use luaSandbox #861

Merged
merged 1 commit into from
Aug 2, 2024
Merged

femiwiki: Use luaSandbox #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/femiwiki/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions dockers/femiwiki/LocalSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
5 changes: 5 additions & 0 deletions dockers/femiwiki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down