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.

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

Tanasta 20230516 fpm #67

Draft
wants to merge 93 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
3e6d38d
Add Dockerfile for barebones Canasta (without Canasta-bundled extensi…
jeffw16 Oct 30, 2022
50af180
Temporarily remove excess packages
jeffw16 Oct 30, 2022
5f18e77
Upgrade ES version
jeffw16 Nov 10, 2022
ceeb0b2
GoogleAnalyticsMetrics has dependency conflict with core MW 1.39
jeffw16 Nov 10, 2022
93e3be6
Add upgraded extensions for 1.39
jeffw16 Nov 10, 2022
25c51e6
Remove GoogleAnalyticsMetrics until Composer dependency conflict fixed
jeffw16 Nov 10, 2022
507edc7
Bump Canasta image version to 1.3.0
jeffw16 Nov 10, 2022
9e2d8db
Hard deprecate wfLoadExtension, wfLoadSkin in 1.3
jeffw16 Nov 11, 2022
4b228ed
Bump version of GoogleAnalyticsMetrics
jeffw16 Nov 25, 2022
92499f7
Fix prepare_extensions_skins_symlinks() in run-apache.sh
pastakhov Nov 25, 2022
c1fe11d
Version 1.2.1
pastakhov Nov 25, 2022
89d3927
Merge pull request #158 from CanastaWiki/fix-prepare_extensions_skins…
jeffw16 Nov 26, 2022
771a104
Use released version of 1.39
jeffw16 Dec 1, 2022
0d8f979
Merge branch 'master' into upgrade/1.39-rc
jeffw16 Dec 1, 2022
b3f2431
Delete pageforms-xss-cherry-picked.patch (#169)
yaronkoren Dec 7, 2022
8d21b4e
Delete core-fix-for-curl-a2f60bb.diff (#170)
yaronkoren Dec 7, 2022
53d6063
Remove patches that are unnecessary for MW 1.39 (#168)
yaronkoren Dec 7, 2022
fefdd0f
Update ApprovedRevs, Cargo, PageForms, VEForAll to the 1.39 version (…
yaronkoren Dec 7, 2022
2712ff7
Removes unnecessary patch for Refreshed skin (#175)
vedmaka Dec 9, 2022
0b35860
Upgrades GitHub action to comply with new changes for save-state (#179)
vedmaka Dec 9, 2022
4fafb97
Improves PR message
vedmaka Dec 10, 2022
530d6d3
Fixes output order
vedmaka Dec 10, 2022
ad610fa
Fixes if statement for message step
vedmaka Dec 10, 2022
bb9ba1e
Merge pull request #180 from CanastaWiki/improvement/action-message
jeffw16 Dec 12, 2022
29ae8f5
Remove DiscussionTools extension (#171)
yaronkoren Dec 12, 2022
8f37e5e
Create RELEASE_NOTES.md (#183)
yaronkoren Dec 13, 2022
a0cac60
Remove "VectorGeneratedSkinData" hook patch (#184)
yaronkoren Dec 13, 2022
ac8d79b
Add UserPageViewTracker extension (#182)
yaronkoren Dec 13, 2022
0b7db63
Add patch for LocalSettingsGenerator.php (#174)
yaronkoren Dec 13, 2022
aa7422a
Add TemplateWizard extension
yaronkoren Dec 13, 2022
954cccf
Canasta 1.2.2 (#193)
jeffw16 Dec 22, 2022
24f25a2
Merge pull request #186 from CanastaWiki/yaronkoren-patch-11
jeffw16 Dec 28, 2022
8f39a12
Delete backup_scripts/, backups/ and kubernetes/ directories (!) (#200)
yaronkoren Dec 28, 2022
fb1c80b
Remove SocialProfile patches (#201)
yaronkoren Jan 6, 2023
b650623
Add header warning to some special pages if $wgSMTP not set (#194)
yaronkoren Jan 17, 2023
3b2c4eb
Add six extensions (#207)
yaronkoren Jan 22, 2023
bd6c2aa
add comments for CIDR ranges
Feb 5, 2023
83306b0
Update some extensions' versions
yaronkoren Feb 16, 2023
2b95bcc
Addressed PR comments and updated Header Tabs
jeffw16 Feb 18, 2023
3404a59
Merge branch 'master' into upgrade/1.39-rc
jeffw16 Feb 18, 2023
b66d51d
Update release notes
jeffw16 Feb 18, 2023
3fd9a2b
Adding back extensions to Composer
jeffw16 Feb 18, 2023
dfae019
Bump Chameleon version
jeffw16 Feb 18, 2023
3c2285d
adding back Google Analytics Metrics
jeffw16 Feb 18, 2023
e26eede
Merge pull request #141 from CanastaWiki/upgrade/1.39-rc
jeffw16 Feb 18, 2023
3193ebd
Update Approved Revs and SimpleBatchUpload
yaronkoren Feb 18, 2023
f879008
Update composer.canasta.json
yaronkoren Feb 18, 2023
a12062d
Merge pull request #211 from CanastaWiki/update-ar-sbu
jeffw16 Feb 18, 2023
4dbb2ca
Disable DB checking if using remote DB
jeffw16 Feb 19, 2023
303d979
Merge pull request #213 from CanastaWiki/feature/use-remote-db-1.3
jeffw16 Feb 19, 2023
34f0084
Update Widgets version
yaronkoren Feb 22, 2023
a8833f3
Merge pull request #216 from CanastaWiki/yaronkoren-patch-12
jeffw16 Feb 27, 2023
22060bf
Add monitoring for extension and skins modifications (patch by @gitma…
yaronkoren Mar 2, 2023
e54c694
Create create-symlinks.sh
yaronkoren Mar 3, 2023
a83e504
Update run-apache.sh
yaronkoren Mar 3, 2023
794e24d
chore: switch to github mirrors for cloning
Ayman161803 Mar 7, 2023
31216dd
Update Dockerfile
yaronkoren Mar 10, 2023
ca83c41
Update RELEASE_NOTES.md
yaronkoren Mar 10, 2023
d794475
added mpm_event and php-fpm support
PiyushRaj927 Mar 15, 2023
df63bf5
Merge pull request #221 from CanastaWiki/clear-minerva-neue-confusion
jeffw16 Mar 15, 2023
1befb51
fixed startup of php-fpm
PiyushRaj927 Mar 17, 2023
8d83a10
fixed php-fpm config
PiyushRaj927 Mar 21, 2023
d0347d0
Merge pull request #222 from PiyushRaj927/master
jeffw16 Mar 21, 2023
8a44a57
Update VEForAll up to version 0.5
pastakhov Mar 27, 2023
26ac5fd
Add missing quotes for strings
freephile Mar 29, 2023
0bf7b15
Update CanastaUtils.php (#227)
yaronkoren Mar 30, 2023
8e0d832
Fix the URL to PR in the github-actions message
pastakhov Apr 6, 2023
b19206c
Merge branch 'master' into canasta_20230407
pastakhov Apr 6, 2023
e5f8b56
remove branches: 1.2.x
pastakhov Apr 6, 2023
505c98c
Remove COPY _sources/patches/skin-refreshed.patch /tmp/skin-refreshed…
pastakhov Apr 6, 2023
5110f32
Restore _sources/patches/skin-refreshed.patch (it is not fixed yet)
pastakhov Apr 6, 2023
58f9958
Merge pull request #230 from CanastaWiki/fix-patch-to-pr
jeffw16 Apr 7, 2023
0f13fb3
Merge pull request #220 from Ayman161803/migrate-to-mirrors
jeffw16 Apr 7, 2023
fa02405
Update VERSION
jeffw16 Apr 7, 2023
5d54809
Merge pull request #224 from CanastaWiki/release/1.3.1
jeffw16 Apr 7, 2023
ab4defb
Merge pull request #210 from CanastaWiki/gregs-first-commit
jeffw16 Apr 7, 2023
52e87ea
Merge branch 'master' into veforall/WIK-874
jeffw16 Apr 7, 2023
b469512
Merge pull request #225 from CanastaWiki/veforall/WIK-874
jeffw16 Apr 7, 2023
53dbe77
Merge pull request #218 from CanastaWiki/new-create-symlinks-script
jeffw16 Apr 7, 2023
fd5f332
Fix for case when web container can't start after incompletely-shutdown
pastakhov Apr 7, 2023
a645eee
Merge branch 'canasta' into canasta_20230408
pastakhov Apr 7, 2023
ec3d92b
Remove inotify-tools
pastakhov Apr 7, 2023
9fc9280
Fix typo in Dockerfile
pastakhov Apr 7, 2023
3dab9ac
Remove mention of LocalisationUpdate in Dockerfile
pastakhov Apr 15, 2023
f312349
Merge branch 'master' into canasta_20230408
pastakhov Apr 26, 2023
d1b11e8
Move php config files from apache2/conf.d to fpm/conf.d
pastakhov Apr 26, 2023
c1dcaed
Merge pull request #233 from CanastaWiki/LocalisationUpdate
jeffw16 May 1, 2023
05dffb4
Merge pull request #231 from CanastaWiki/fix-for-incompletely-shutdown
jeffw16 May 1, 2023
d161389
Update versions of six extensions (#232)
yaronkoren May 1, 2023
991d0d2
Fix path for php-fpm config files
pastakhov Apr 26, 2023
817ccb1
Merge pull request #245 from CanastaWiki/fpm-config/WIK-893
jeffw16 May 16, 2023
d741cd8
Merge branch 'canasta' into canasta_20230516_fpm
pastakhov May 16, 2023
8cb0eb6
Merge branch 'master' into canasta_20230516_fpm
pastakhov May 16, 2023
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
256 changes: 131 additions & 125 deletions Dockerfile

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.3.1-pre
17 changes: 17 additions & 0 deletions _sources/configs/mpm_event.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# event MPM
# StartServers: number of server processes to start
# ServerLimit: Upper limit on configurable number of processes
# ThreadsPerChild: Number of threads created by each child process
# MaxRequestWorkers: maximum number of server processes allowed to start
# MaxConnectionsPerChild: maximum number of requests a server process serves

<IfModule mpm_event_module>
StartServers 3
ServerLimit 16
ThreadsPerChild 25
MaxRequestWorkers 400
MaxConnectionsPerChild 0
</IfModule>


# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
16 changes: 0 additions & 16 deletions _sources/configs/mpm_prefork.conf

This file was deleted.

3 changes: 3 additions & 0 deletions _sources/scripts/run-apache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ make_dir_writable "$MW_VOLUME" -not '(' -path "$MW_VOLUME/images" -prune ')'
touch "$WWW_ROOT/.maintenance"
/run-maintenance-scripts.sh &

# Running php-fpm
/run-php-fpm.sh &

############### Run Apache ###############
# Make sure we're not confused by old, incompletely-shutdown Apache
# context after restarting the container. Apache won't start correctly
Expand Down
8 changes: 8 additions & 0 deletions _sources/scripts/run-php-fpm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

set -x

echo "starting php-fpm"
# Running php-fpm
mkdir -p /run/php
exec /usr/sbin/php-fpm7.4