Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
apache2-php-base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai3
docker
apache2-php-base
Commits
2f011aae
Commit
2f011aae
authored
3 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Update to PHP 7.4
parent
6482b800
No related branches found
No related tags found
2 merge requests
!4
Use S6
,
!3
Bullseye
Pipeline
#19854
passed
3 years ago
Stage: build
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
build.sh
+1
-1
1 addition, 1 deletion
build.sh
conf/chaperone.d/fpm.conf
+2
-2
2 additions, 2 deletions
conf/chaperone.d/fpm.conf
conf/php/7.4/fpm/php-fpm.conf
+6
-0
6 additions, 0 deletions
conf/php/7.4/fpm/php-fpm.conf
conf/php/7.4/fpm/pool.d/www.conf
+1
-1
1 addition, 1 deletion
conf/php/7.4/fpm/pool.d/www.conf
with
10 additions
and
4 deletions
build.sh
+
1
−
1
View file @
2f011aae
...
...
@@ -45,7 +45,7 @@ echo "export PHP_FPM_EXPORTER_PORT=\`expr \$APACHE_PORT + 200\`" >> /etc/apache2
# Enable php configuration.
a2enmod proxy_fcgi setenvif
a2enconf
-q
php7.
3
-fpm
a2enconf
-q
php7.
4
-fpm
# Rsync our configuration, on top of /etc.
rsync
-a
/tmp/conf/ /etc/
...
...
This diff is collapsed.
Click to expand it.
conf/chaperone.d/fpm.conf
+
2
−
2
View file @
2f011aae
...
...
@@ -4,10 +4,10 @@ fpm-setup.service: {
type
:
oneshot
,
}
fpm
.
service
: {
command
:
"/usr/sbin/php-fpm7.
3
--force-stderr --nodaemonize"
,
command
:
"/usr/sbin/php-fpm7.
4
--force-stderr --nodaemonize"
,
exit_kills
:
true
,
}
fpm
-
exporter
.
service
: {
command
:
"sh -c '. /etc/apache2/envvars && HOME=/ exec /usr/sbin/php-fpm-exporter server --phpfpm.scrape-uri=unix:///run/php/php7.
3
-fpm.sock\\;/status --web.listen-address=:$PHP_FPM_EXPORTER_PORT'"
,
command
:
"sh -c '. /etc/apache2/envvars && HOME=/ exec /usr/sbin/php-fpm-exporter server --phpfpm.scrape-uri=unix:///run/php/php7.
4
-fpm.sock\\;/status --web.listen-address=:$PHP_FPM_EXPORTER_PORT'"
,
restart
:
true
,
}
This diff is collapsed.
Click to expand it.
conf/php/7.
3
/fpm/php-fpm.conf
→
conf/php/7.
4
/fpm/php-fpm.conf
+
6
−
0
View file @
2f011aae
[
global
]
pid
= /
run
/
php
/
php7
.
3
-
fpm
.
pid
pid
= /
run
/
php
/
php7
.
4
-
fpm
.
pid
error_log
= /
dev
/
fd
/
2
systemd_interval
=
0
include
=/
etc
/
php
/
7
.
3
/
fpm
/
pool
.
d
/*.
conf
include
=/
etc
/
php
/
7
.
4
/
fpm
/
pool
.
d
/*.
conf
This diff is collapsed.
Click to expand it.
conf/php/7.
3
/fpm/pool.d/www.conf
→
conf/php/7.
4
/fpm/pool.d/www.conf
+
1
−
1
View file @
2f011aae
[
www
]
listen
= /
run
/
php
/
php7
.
3
-
fpm
.
sock
listen
= /
run
/
php
/
php7
.
4
-
fpm
.
sock
pm
=
dynamic
pm
.
max_children
=
20
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment