Skip to content

Commit 8237da4

Browse files
cytopiamartin-rueegg
cytopia
authored and
martin-rueegg
committed
Add xhprof
1 parent a7d7971 commit 8237da4

50 files changed

Lines changed: 425 additions & 14 deletions

Some content is hidden

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

‎.ansible/DOCKERFILES/Dockerfile-mods.j2‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 3 additions & 0 deletions
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‎

Lines changed: 6 additions & 0 deletions
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‎

Lines changed: 17 additions & 0 deletions
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,22 @@ extensions_available:
15471548
5.2:
15481549
type: pecl
15491550
version: 2.2.7
1551+
xhprof:
1552+
disabled: [5.2]
1553+
all:
1554+
type: pecl
1555+
5.6:
1556+
type: pecl
1557+
version: 0.9.4
1558+
5.5:
1559+
type: pecl
1560+
version: 0.9.4
1561+
5.4:
1562+
type: pecl
1563+
version: 0.9.4
1564+
5.3:
1565+
type: pecl
1566+
version: 0.9.4
15501567
xlswriter:
15511568
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
15521569
all:

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,17 @@ RUN set -eux \
640640
&& true
641641

642642

643+
# -------------------- Installing PHP Extension: xhprof --------------------
644+
RUN set -eux \
645+
# Installation: Version specific
646+
# Type: PECL extension
647+
# Default: Pecl command
648+
&& pecl install xhprof-0.9.4 \
649+
# Enabling
650+
&& docker-php-ext-enable xhprof \
651+
&& true
652+
653+
643654
# -------------------- Installing PHP Extension: xmlrpc --------------------
644655
RUN set -eux \
645656
# Installation: Generic
@@ -968,6 +979,8 @@ RUN set -eux \
968979
&& php-fpm -m | grep -oiE '^wddx$' \
969980
&& php -m | grep -oiE '^xdebug$' \
970981
&& php-fpm -m | grep -oiE '^xdebug$' \
982+
&& php -m | grep -oiE '^xhprof$' \
983+
&& php-fpm -m | grep -oiE '^xhprof$' \
971984
&& php -m | grep -oiE '^xmlreader$' \
972985
&& php-fpm -m | grep -oiE '^xmlreader$' \
973986
&& php -m | grep -oiE '^xmlrpc$' \
@@ -983,11 +996,13 @@ RUN set -eux \
983996
&& true
984997

985998

986-
# Deactive PSR and Phalcon:
999+
# Deactivate PSR and Phalcon:
9871000
# https://github.com/devilbox/docker-php-fpm/issues/201
1001+
# Deactivate xhprof (might collide with Xdebug)
9881002
RUN set -eux \
9891003
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
9901004
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1005+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
9911006

9921007

9931008
###

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,17 @@ RUN set -eux \
651651
&& true
652652

653653

654+
# -------------------- Installing PHP Extension: xhprof --------------------
655+
RUN set -eux \
656+
# Installation: Version specific
657+
# Type: PECL extension
658+
# Default: Pecl command
659+
&& pecl install xhprof-0.9.4 \
660+
# Enabling
661+
&& docker-php-ext-enable xhprof \
662+
&& true
663+
664+
654665
# -------------------- Installing PHP Extension: xmlrpc --------------------
655666
RUN set -eux \
656667
# Installation: Generic
@@ -979,6 +990,8 @@ RUN set -eux \
979990
&& php-fpm -m | grep -oiE '^wddx$' \
980991
&& php -m | grep -oiE '^xdebug$' \
981992
&& php-fpm -m | grep -oiE '^xdebug$' \
993+
&& php -m | grep -oiE '^xhprof$' \
994+
&& php-fpm -m | grep -oiE '^xhprof$' \
982995
&& php -m | grep -oiE '^xmlreader$' \
983996
&& php-fpm -m | grep -oiE '^xmlreader$' \
984997
&& php -m | grep -oiE '^xmlrpc$' \
@@ -994,11 +1007,13 @@ RUN set -eux \
9941007
&& true
9951008

9961009

997-
# Deactive PSR and Phalcon:
1010+
# Deactivate PSR and Phalcon:
9981011
# https://github.com/devilbox/docker-php-fpm/issues/201
1012+
# Deactivate xhprof (might collide with Xdebug)
9991013
RUN set -eux \
10001014
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10011015
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1016+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10021017

10031018

10041019
###

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,17 @@ RUN set -eux \
689689
&& true
690690

691691

692+
# -------------------- Installing PHP Extension: xhprof --------------------
693+
RUN set -eux \
694+
# Installation: Version specific
695+
# Type: PECL extension
696+
# Default: Pecl command
697+
&& pecl install xhprof-0.9.4 \
698+
# Enabling
699+
&& docker-php-ext-enable xhprof \
700+
&& true
701+
702+
692703
# -------------------- Installing PHP Extension: xmlrpc --------------------
693704
RUN set -eux \
694705
# Installation: Generic
@@ -1032,6 +1043,8 @@ RUN set -eux \
10321043
&& php-fpm -m | grep -oiE '^wddx$' \
10331044
&& php -m | grep -oiE '^xdebug$' \
10341045
&& php-fpm -m | grep -oiE '^xdebug$' \
1046+
&& php -m | grep -oiE '^xhprof$' \
1047+
&& php-fpm -m | grep -oiE '^xhprof$' \
10351048
&& php -m | grep -oiE '^xmlreader$' \
10361049
&& php-fpm -m | grep -oiE '^xmlreader$' \
10371050
&& php -m | grep -oiE '^xmlrpc$' \
@@ -1047,11 +1060,13 @@ RUN set -eux \
10471060
&& true
10481061

10491062

1050-
# Deactive PSR and Phalcon:
1063+
# Deactivate PSR and Phalcon:
10511064
# https://github.com/devilbox/docker-php-fpm/issues/201
1065+
# Deactivate xhprof (might collide with Xdebug)
10521066
RUN set -eux \
10531067
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10541068
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1069+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10551070

10561071

10571072
###

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,17 @@ RUN set -eux \
708708
&& true
709709

710710

711+
# -------------------- Installing PHP Extension: xhprof --------------------
712+
RUN set -eux \
713+
# Installation: Version specific
714+
# Type: PECL extension
715+
# Default: Pecl command
716+
&& pecl install xhprof-0.9.4 \
717+
# Enabling
718+
&& docker-php-ext-enable xhprof \
719+
&& true
720+
721+
711722
# -------------------- Installing PHP Extension: xmlrpc --------------------
712723
RUN set -eux \
713724
# Installation: Generic
@@ -1050,6 +1061,8 @@ RUN set -eux \
10501061
&& php-fpm -m | grep -oiE '^wddx$' \
10511062
&& php -m | grep -oiE '^xdebug$' \
10521063
&& php-fpm -m | grep -oiE '^xdebug$' \
1064+
&& php -m | grep -oiE '^xhprof$' \
1065+
&& php-fpm -m | grep -oiE '^xhprof$' \
10531066
&& php -m | grep -oiE '^xmlreader$' \
10541067
&& php-fpm -m | grep -oiE '^xmlreader$' \
10551068
&& php -m | grep -oiE '^xmlrpc$' \
@@ -1065,11 +1078,13 @@ RUN set -eux \
10651078
&& true
10661079

10671080

1068-
# Deactive PSR and Phalcon:
1081+
# Deactivate PSR and Phalcon:
10691082
# https://github.com/devilbox/docker-php-fpm/issues/201
1083+
# Deactivate xhprof (might collide with Xdebug)
10701084
RUN set -eux \
10711085
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10721086
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1087+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10731088

10741089

10751090
###

0 commit comments

Comments
 (0)