Skip to content

Commit efcd621

Browse files
cytopiacytopia
authored
Merge pull request #267 from devilbox/release-0.150
Add xhprof
2 parents 26c4fb5 + c0ee7a7 commit efcd621

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+345
-14
lines changed

‎.ansible/DOCKERFILES/Dockerfile-mods.j2

+3-1
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,13 @@ RUN set -eux \
456456

457457

458458
{% endif %}
459-
# Deactive PSR and Phalcon:
459+
# Deactivate PSR and Phalcon:
460460
# https://github.com/devilbox/docker-php-fpm/issues/201
461+
# Deactivate xhprof (might collide with Xdebug)
461462
RUN set -eux \
462463
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
463464
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
465+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
464466

465467

466468
###

‎.ansible/DOCKERFILES/Dockerfile-slim.j2

+3
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,9 @@ RUN set -eux \
454454
fi \
455455
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
456456
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
457+
fi \
458+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
459+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
457460
fi
458461

459462
###

‎.ansible/DOCKERFILES/Dockerfile-work.j2

+6
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ RUN set -eux \
213213
fi \
214214
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
215215
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
216+
fi \
217+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
218+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
216219
fi
217220

218221
###
@@ -497,6 +500,9 @@ RUN set -eux \
497500
fi \
498501
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
499502
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
503+
fi \
504+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
505+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
500506
fi
501507
502508
###

‎.ansible/group_vars/all/mods.yml

+5
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ extensions_enabled:
105105
- vips
106106
- wddx
107107
- xdebug
108+
- xhprof
108109
- xlswriter
109110
- xmlreader
110111
- xmlrpc
@@ -1547,6 +1548,10 @@ extensions_available:
15471548
5.2:
15481549
type: pecl
15491550
version: 2.2.7
1551+
xhprof:
1552+
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
1553+
all:
1554+
type: pecl
15501555
xlswriter:
15511556
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
15521557
all:

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
## Unreleased
55

66

7+
## Release 0.150
8+
9+
### Added
10+
- Added `xhprof` PHP extension
11+
12+
713
## Release 0.149
814

915
### Added

‎Dockerfiles/mods/Dockerfile-5.2

+3-1
Original file line numberDiff line numberDiff line change
@@ -810,11 +810,13 @@ RUN set -eux \
810810
&& true
811811

812812

813-
# Deactive PSR and Phalcon:
813+
# Deactivate PSR and Phalcon:
814814
# https://github.com/devilbox/docker-php-fpm/issues/201
815+
# Deactivate xhprof (might collide with Xdebug)
815816
RUN set -eux \
816817
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
817818
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
819+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
818820

819821

820822
###

‎Dockerfiles/mods/Dockerfile-5.3

+3-1
Original file line numberDiff line numberDiff line change
@@ -983,11 +983,13 @@ RUN set -eux \
983983
&& true
984984

985985

986-
# Deactive PSR and Phalcon:
986+
# Deactivate PSR and Phalcon:
987987
# https://github.com/devilbox/docker-php-fpm/issues/201
988+
# Deactivate xhprof (might collide with Xdebug)
988989
RUN set -eux \
989990
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
990991
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
992+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
991993

992994

993995
###

‎Dockerfiles/mods/Dockerfile-5.4

+3-1
Original file line numberDiff line numberDiff line change
@@ -994,11 +994,13 @@ RUN set -eux \
994994
&& true
995995

996996

997-
# Deactive PSR and Phalcon:
997+
# Deactivate PSR and Phalcon:
998998
# https://github.com/devilbox/docker-php-fpm/issues/201
999+
# Deactivate xhprof (might collide with Xdebug)
9991000
RUN set -eux \
10001001
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10011002
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1003+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10021004

10031005

10041006
###

‎Dockerfiles/mods/Dockerfile-5.5

+3-1
Original file line numberDiff line numberDiff line change
@@ -1047,11 +1047,13 @@ RUN set -eux \
10471047
&& true
10481048

10491049

1050-
# Deactive PSR and Phalcon:
1050+
# Deactivate PSR and Phalcon:
10511051
# https://github.com/devilbox/docker-php-fpm/issues/201
1052+
# Deactivate xhprof (might collide with Xdebug)
10521053
RUN set -eux \
10531054
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10541055
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1056+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10551057

10561058

10571059
###

‎Dockerfiles/mods/Dockerfile-5.6

+3-1
Original file line numberDiff line numberDiff line change
@@ -1065,11 +1065,13 @@ RUN set -eux \
10651065
&& true
10661066

10671067

1068-
# Deactive PSR and Phalcon:
1068+
# Deactivate PSR and Phalcon:
10691069
# https://github.com/devilbox/docker-php-fpm/issues/201
1070+
# Deactivate xhprof (might collide with Xdebug)
10701071
RUN set -eux \
10711072
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10721073
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1074+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10731075

10741076

10751077
###

‎Dockerfiles/mods/Dockerfile-7.0

+16-1
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,17 @@ RUN set -eux \
833833
&& true
834834

835835

836+
# -------------------- Installing PHP Extension: xhprof --------------------
837+
RUN set -eux \
838+
# Installation: Generic
839+
# Type: PECL extension
840+
# Default: Pecl command
841+
&& pecl install xhprof \
842+
# Enabling
843+
&& docker-php-ext-enable xhprof \
844+
&& true
845+
846+
836847
# -------------------- Installing PHP Extension: xlswriter --------------------
837848
RUN set -eux \
838849
# Installation: Generic
@@ -1197,6 +1208,8 @@ RUN set -eux \
11971208
&& php-fpm -m | grep -oiE '^wddx$' \
11981209
&& php -m | grep -oiE '^xdebug$' \
11991210
&& php-fpm -m | grep -oiE '^xdebug$' \
1211+
&& php -m | grep -oiE '^xhprof$' \
1212+
&& php-fpm -m | grep -oiE '^xhprof$' \
12001213
&& php -m | grep -oiE '^xlswriter$' \
12011214
&& php-fpm -m | grep -oiE '^xlswriter$' \
12021215
&& php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
12141227
&& true
12151228

12161229

1217-
# Deactive PSR and Phalcon:
1230+
# Deactivate PSR and Phalcon:
12181231
# https://github.com/devilbox/docker-php-fpm/issues/201
1232+
# Deactivate xhprof (might collide with Xdebug)
12191233
RUN set -eux \
12201234
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
12211235
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1236+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
12221237

12231238

12241239
###

‎Dockerfiles/mods/Dockerfile-7.1

+16-1
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,17 @@ RUN set -eux \
851851
&& true
852852

853853

854+
# -------------------- Installing PHP Extension: xhprof --------------------
855+
RUN set -eux \
856+
# Installation: Generic
857+
# Type: PECL extension
858+
# Default: Pecl command
859+
&& pecl install xhprof \
860+
# Enabling
861+
&& docker-php-ext-enable xhprof \
862+
&& true
863+
864+
854865
# -------------------- Installing PHP Extension: xlswriter --------------------
855866
RUN set -eux \
856867
# Installation: Generic
@@ -1217,6 +1228,8 @@ RUN set -eux \
12171228
&& php-fpm -m | grep -oiE '^wddx$' \
12181229
&& php -m | grep -oiE '^xdebug$' \
12191230
&& php-fpm -m | grep -oiE '^xdebug$' \
1231+
&& php -m | grep -oiE '^xhprof$' \
1232+
&& php-fpm -m | grep -oiE '^xhprof$' \
12201233
&& php -m | grep -oiE '^xlswriter$' \
12211234
&& php-fpm -m | grep -oiE '^xlswriter$' \
12221235
&& php -m | grep -oiE '^xmlreader$' \
@@ -1234,11 +1247,13 @@ RUN set -eux \
12341247
&& true
12351248

12361249

1237-
# Deactive PSR and Phalcon:
1250+
# Deactivate PSR and Phalcon:
12381251
# https://github.com/devilbox/docker-php-fpm/issues/201
1252+
# Deactivate xhprof (might collide with Xdebug)
12391253
RUN set -eux \
12401254
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
12411255
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1256+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
12421257

12431258

12441259
###

‎Dockerfiles/mods/Dockerfile-7.2

+16-1
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,17 @@ RUN set -eux \
854854
&& true
855855

856856

857+
# -------------------- Installing PHP Extension: xhprof --------------------
858+
RUN set -eux \
859+
# Installation: Generic
860+
# Type: PECL extension
861+
# Default: Pecl command
862+
&& pecl install xhprof \
863+
# Enabling
864+
&& docker-php-ext-enable xhprof \
865+
&& true
866+
867+
857868
# -------------------- Installing PHP Extension: xlswriter --------------------
858869
RUN set -eux \
859870
# Installation: Generic
@@ -1222,6 +1233,8 @@ RUN set -eux \
12221233
&& php-fpm -m | grep -oiE '^wddx$' \
12231234
&& php -m | grep -oiE '^xdebug$' \
12241235
&& php-fpm -m | grep -oiE '^xdebug$' \
1236+
&& php -m | grep -oiE '^xhprof$' \
1237+
&& php-fpm -m | grep -oiE '^xhprof$' \
12251238
&& php -m | grep -oiE '^xlswriter$' \
12261239
&& php-fpm -m | grep -oiE '^xlswriter$' \
12271240
&& php -m | grep -oiE '^xmlreader$' \
@@ -1239,11 +1252,13 @@ RUN set -eux \
12391252
&& true
12401253

12411254

1242-
# Deactive PSR and Phalcon:
1255+
# Deactivate PSR and Phalcon:
12431256
# https://github.com/devilbox/docker-php-fpm/issues/201
1257+
# Deactivate xhprof (might collide with Xdebug)
12441258
RUN set -eux \
12451259
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
12461260
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1261+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
12471262

12481263

12491264
###

‎Dockerfiles/mods/Dockerfile-7.3

+16-1
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,17 @@ RUN set -eux \
848848
&& true
849849

850850

851+
# -------------------- Installing PHP Extension: xhprof --------------------
852+
RUN set -eux \
853+
# Installation: Generic
854+
# Type: PECL extension
855+
# Default: Pecl command
856+
&& pecl install xhprof \
857+
# Enabling
858+
&& docker-php-ext-enable xhprof \
859+
&& true
860+
861+
851862
# -------------------- Installing PHP Extension: xlswriter --------------------
852863
RUN set -eux \
853864
# Installation: Generic
@@ -1214,6 +1225,8 @@ RUN set -eux \
12141225
&& php-fpm -m | grep -oiE '^wddx$' \
12151226
&& php -m | grep -oiE '^xdebug$' \
12161227
&& php-fpm -m | grep -oiE '^xdebug$' \
1228+
&& php -m | grep -oiE '^xhprof$' \
1229+
&& php-fpm -m | grep -oiE '^xhprof$' \
12171230
&& php -m | grep -oiE '^xlswriter$' \
12181231
&& php-fpm -m | grep -oiE '^xlswriter$' \
12191232
&& php -m | grep -oiE '^xmlreader$' \
@@ -1231,11 +1244,13 @@ RUN set -eux \
12311244
&& true
12321245

12331246

1234-
# Deactive PSR and Phalcon:
1247+
# Deactivate PSR and Phalcon:
12351248
# https://github.com/devilbox/docker-php-fpm/issues/201
1249+
# Deactivate xhprof (might collide with Xdebug)
12361250
RUN set -eux \
12371251
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
12381252
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1253+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
12391254

12401255

12411256
###

‎Dockerfiles/mods/Dockerfile-7.4

+16-1
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,17 @@ RUN set -eux \
835835
&& true
836836

837837

838+
# -------------------- Installing PHP Extension: xhprof --------------------
839+
RUN set -eux \
840+
# Installation: Generic
841+
# Type: PECL extension
842+
# Default: Pecl command
843+
&& pecl install xhprof \
844+
# Enabling
845+
&& docker-php-ext-enable xhprof \
846+
&& true
847+
848+
838849
# -------------------- Installing PHP Extension: xlswriter --------------------
839850
RUN set -eux \
840851
# Installation: Generic
@@ -1197,6 +1208,8 @@ RUN set -eux \
11971208
&& php-fpm -m | grep -oiE '^vips$' \
11981209
&& php -m | grep -oiE '^xdebug$' \
11991210
&& php-fpm -m | grep -oiE '^xdebug$' \
1211+
&& php -m | grep -oiE '^xhprof$' \
1212+
&& php-fpm -m | grep -oiE '^xhprof$' \
12001213
&& php -m | grep -oiE '^xlswriter$' \
12011214
&& php-fpm -m | grep -oiE '^xlswriter$' \
12021215
&& php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
12141227
&& true
12151228

12161229

1217-
# Deactive PSR and Phalcon:
1230+
# Deactivate PSR and Phalcon:
12181231
# https://github.com/devilbox/docker-php-fpm/issues/201
1232+
# Deactivate xhprof (might collide with Xdebug)
12191233
RUN set -eux \
12201234
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
12211235
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1236+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
12221237

12231238

12241239
###

0 commit comments

Comments
 (0)