Compare commits

...

7 Commits

Author SHA1 Message Date
cytopia
042023514d Merge pull request #268 from devilbox/release-0.151
Allow to use supervisorctl to be able to reload PHP configuration wit…
2023-01-10 12:34:42 +01:00
cytopia
b75c0eb4fb Allow to use supervisorctl to be able to reload PHP configuration without restarting 2023-01-09 23:56:43 +01:00
cytopia
efcd621c48 Merge pull request #267 from devilbox/release-0.150
Add xhprof
2023-01-02 11:24:12 +01:00
cytopia
c0ee7a7e13 Remove legacy xhprof 2023-01-01 17:12:21 +01:00
cytopia
3770ac24ff Add xhprof 2023-01-01 14:18:47 +01:00
cytopia
26c4fb5419 Merge pull request #266 from devilbox/release-0.149
Release 0.149
2022-12-28 11:55:54 +01:00
cytopia
393ecc5dac Added net-tools 2022-12-27 12:46:33 +01:00
73 changed files with 628 additions and 39 deletions

View File

@@ -456,11 +456,13 @@ RUN set -eux \
{% endif %}
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -81,7 +81,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -454,6 +454,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -213,6 +213,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -497,6 +500,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -105,6 +105,7 @@ extensions_enabled:
- vips
- wddx
- xdebug
- xhprof
- xlswriter
- xmlreader
- xmlrpc
@@ -1547,6 +1548,10 @@ extensions_available:
5.2:
type: pecl
version: 2.2.7
xhprof:
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
all:
type: pecl
xlswriter:
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
all:

View File

@@ -22,6 +22,7 @@ tools_enabled:
- linkcheck
- mdlint
- mupdf-tools
- net-tools
- phalcon-devtools
- php-cs-fixer
- phpcbf
@@ -337,6 +338,12 @@ tools_available:
all:
type: apt
package: mupdf-tools
net-tools:
disabled: []
check: netstat --version | grep net-tools || (netstat --version; false)
all:
type: apt
package: net-tools
phalcon-devtools:
disabled: [5.2, 5.3, 5.4, 8.2]
check: |

View File

@@ -4,6 +4,24 @@
## Unreleased
## Release 0.151
### Added
- Allow to use supervisorctl to be able to reload PHP configuration without restarting
## Release 0.150
### Added
- Added `xhprof` PHP extension
## Release 0.149
### Added
- Added `net-tools` package
## Release 0.148
### Added

View File

@@ -810,11 +810,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -983,11 +983,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -994,11 +994,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -1047,11 +1047,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -1065,11 +1065,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -833,6 +833,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1197,6 +1208,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^wddx$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -851,6 +851,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1217,6 +1228,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^wddx$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1234,11 +1247,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -854,6 +854,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1222,6 +1233,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^wddx$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1239,11 +1252,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -848,6 +848,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1214,6 +1225,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^wddx$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1231,11 +1244,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -835,6 +835,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1197,6 +1208,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^vips$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -819,6 +819,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1170,6 +1181,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^vips$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1185,11 +1198,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -797,6 +797,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1146,6 +1157,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^vips$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1161,11 +1174,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -749,6 +749,17 @@ RUN set -eux \
&& true
# -------------------- Installing PHP Extension: xhprof --------------------
RUN set -eux \
# Installation: Generic
# Type: PECL extension
# Default: Pecl command
&& pecl install xhprof \
# Enabling
&& docker-php-ext-enable xhprof \
&& true
# -------------------- Installing PHP Extension: xlswriter --------------------
RUN set -eux \
# Installation: Generic
@@ -1087,6 +1098,8 @@ RUN set -eux \
&& php-fpm -m | grep -oiE '^uuid$' \
&& php -m | grep -oiE '^xdebug$' \
&& php-fpm -m | grep -oiE '^xdebug$' \
&& php -m | grep -oiE '^xhprof$' \
&& php-fpm -m | grep -oiE '^xhprof$' \
&& php -m | grep -oiE '^xlswriter$' \
&& php-fpm -m | grep -oiE '^xlswriter$' \
&& php -m | grep -oiE '^xmlreader$' \
@@ -1102,11 +1115,13 @@ RUN set -eux \
&& true
# Deactive PSR and Phalcon:
# Deactivate PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
# Deactivate xhprof (might collide with Xdebug)
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -79,7 +79,6 @@ RUN set -eux \
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
###

View File

@@ -9,6 +9,51 @@ set -o pipefail
# Functions
############################################################
###
### Create main supvervisord configuration file
###
supervisor_create_config() {
local path="${1}"
# Enable supervisorctl (default: disabled)
SVCTL_ENABLE="${SVCTL_ENABLE:-0}"
if [ -z "${SVCTL_USER:-}" ]; then
SVCTL_USER="$( get_random_alphanum "10" )"
fi
if [ -z "${SVCTL_PASS:-}" ]; then
SVCTL_PASS="$( get_random_alphanum "10" )"
fi
{
# Use 'echo_supervisord_conf' to generate an example config
if [ "${SVCTL_ENABLE}" = "1" ]; then
echo "[rpcinterface:supervisor]"
echo "supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface"
echo
echo "[unix_http_server]"
echo "file = /tmp/supervisor.sock"
echo "chmod = 0700"
echo
echo "[supervisorctl]"
echo "serverurl = unix:///tmp/supervisor.sock"
echo "username = ${SVCTL_USER} ; should be same as in [*_http_server] if set"
echo "password = ${SVCTL_PASS} ; should be same as in [*_http_server] if set"
fi
echo "[supervisord]"
echo "user = root"
echo "nodaemon = true"
echo "loglevel = info"
echo "logfile = /var/log/supervisor/supervisord.log"
echo "pidfile = /var/run/supervisord.pid"
echo "childlogdir = /var/log/supervisor"
echo "strip_ansi = true" # Required to fix tail logs
echo
echo "[include]"
echo "files = /etc/supervisor/conf.d/*.conf /etc/supervisor/custom.d/*.conf"
} > "${path}"
}
###
### Add service to supervisord
###
@@ -49,3 +94,26 @@ supervisor_add_service() {
echo "stderr_events_enabled = true";
} > "${confd}/${name}.conf"
}
###
### Get Random alphanumeric string
###
get_random_alphanum() {
local len="${1:-15}" # length defaults to 15
tr -dc A-Za-z0-9 < /dev/urandom | head -c "${len}" | xargs || true
}
############################################################
# Sanity Checks
############################################################
if ! command -v tr >/dev/null 2>&1; then
echo "tr not found, but required."
exit 1
fi
if ! command -v xargs >/dev/null 2>&1; then
echo "xargs not found, but required."
exit 1
fi

View File

@@ -120,6 +120,12 @@ if ! port_forward_validate "FORWARD_PORTS_TO_LOCALHOST" "${DEBUG_LEVEL}"; then
fi
###
### Supvervisor: supervisord.conf
###
supervisor_create_config "/etc/supervisor/supervisord.conf"
###
### Supervisor: socat
###
@@ -185,7 +191,6 @@ execute_custom_scripts "/startup.1.d" "${DEBUG_LEVEL}"
execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
###
###
### Startup
###

View File

@@ -1,9 +0,0 @@
[supervisord]
user = root
nodaemon = true
logfile = /var/log/supervisor/supervisord.log
pidfile = /var/run/supervisord.pid
childlogdir = /var/log/supervisor
[include]
files = /etc/supervisor/conf.d/*.conf /etc/supervisor/custom.d/*.conf

View File

@@ -543,6 +543,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -543,6 +543,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -543,6 +543,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -543,6 +543,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -547,6 +547,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -547,6 +547,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -541,6 +541,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -120,6 +120,12 @@ if ! port_forward_validate "FORWARD_PORTS_TO_LOCALHOST" "${DEBUG_LEVEL}"; then
fi
###
### Supvervisor: supervisord.conf
###
supervisor_create_config "/etc/supervisor/supervisord.conf"
###
### Supervisor: socat
###
@@ -162,7 +168,7 @@ copy_ini_files "${DVL_PHP_CUST_INI_DIR}" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
if [ "${PHP_VERSION}" = "5.2" ]; then
copy_fpm_5_2_conf_file "${DVL_PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
else
copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
fi

View File

@@ -189,6 +189,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -242,6 +245,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -360,6 +364,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& PHPCBF_URL="https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar" \
@@ -523,6 +532,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -651,6 +661,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& phpcbf --version | grep -E 'version [0-9][.0-9]+' || (phpcbf --version; false) \
@@ -760,6 +775,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -277,6 +280,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -395,6 +399,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \
@@ -596,6 +605,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -724,6 +734,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \
@@ -853,6 +868,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -277,6 +280,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -418,6 +422,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \
@@ -619,6 +628,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -762,6 +772,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \
@@ -891,6 +906,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -277,6 +280,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -434,6 +438,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -674,6 +683,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -827,6 +837,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -978,6 +993,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -285,6 +288,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -285,6 +288,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -285,6 +288,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -223,6 +223,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -285,6 +288,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -225,6 +225,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -287,6 +290,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -225,6 +225,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -287,6 +290,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -225,6 +225,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -287,6 +290,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -225,6 +225,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -287,6 +290,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -707,6 +716,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -860,6 +870,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
@@ -1016,6 +1031,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -225,6 +225,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###
@@ -287,6 +290,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -442,6 +446,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& PHPCBF_URL="https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar" \
@@ -660,6 +669,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
@@ -813,6 +823,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& phpcbf --version | grep -E 'version [0-9][.0-9]+' || (phpcbf --version; false) \
@@ -942,6 +957,9 @@ RUN set -eux \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
fi
###

View File

@@ -199,6 +199,7 @@ The provided Docker images heavily rely on inheritance to guarantee smallest pos
[`vips`](php_modules/vips/)
[`wddx`](php_modules/wddx/)
[`Xdebug`](php_modules/xdebug/)
[`xhprof`](php_modules/xhprof/)
[`xlswriter`](php_modules/xlswriter/)
[`xml`](php_modules/xml/)
[`xmlreader`](php_modules/xmlreader/)

View File

@@ -97,6 +97,10 @@ get_modules_from_image() {
modules="$( printf "%s\n%s\n" "${modules}" "phalcon" )";
fi
if docker run --rm --platform "${ARCH}" --entrypoint=find "${IMAGE}:${img_tag}" /usr/local/lib/php/extensions -name 'xhprof.so' | grep -q xhprof.so; then
modules="$( printf "%s\n%s\n" "${modules}" "xhprof" )";
fi
# Sort alphabetically
modules="$( echo "${modules}" | sort -fu )"

View File

@@ -390,6 +390,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools
| [mdl][lnk_mdl] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [mdlint][lnk_mdlint] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [mupdf-tools][lnk_mupdf-tools] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [net-tools][lnk_net-tools] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [**node**][lnk_**node**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [**npm**][lnk_**npm**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| [**nvm**][lnk_**nvm**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
@@ -442,6 +443,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools
[lnk_mdl]: ../php_tools/mdl
[lnk_mdlint]: ../php_tools/mdlint
[lnk_mupdf-tools]: ../php_tools/mupdf-tools
[lnk_net-tools]: ../php_tools/net-tools
[lnk_**node**]: https://nodejs.org/en/
[lnk_**npm**]: https://nodejs.org/en/knowledge/getting-started/npm/what-is-npm/
[lnk_**nvm**]: https://github.com/nvm-sh/nvm

View File

@@ -2196,6 +2196,22 @@ The following PHP modules are available on the `mods`, `prod`, `slim` and `work`
<td class="ext_mods_xdebug_8.1">✓</td>
<td class="ext_mods_xdebug_8.2">✓</td>
</tr>
<tr>
<td><a href="../php_modules/xhprof">xhprof</a></td>
<td class="ext_mods_xhprof_5.2"></td>
<td class="ext_mods_xhprof_5.3"></td>
<td class="ext_mods_xhprof_5.4"></td>
<td class="ext_mods_xhprof_5.5"></td>
<td class="ext_mods_xhprof_5.6"></td>
<td class="ext_mods_xhprof_7.0">✓</td>
<td class="ext_mods_xhprof_7.1">✓</td>
<td class="ext_mods_xhprof_7.2">✓</td>
<td class="ext_mods_xhprof_7.3">✓</td>
<td class="ext_mods_xhprof_7.4">✓</td>
<td class="ext_mods_xhprof_8.0">✓</td>
<td class="ext_mods_xhprof_8.1">✓</td>
<td class="ext_mods_xhprof_8.2">✓</td>
</tr>
<tr>
<td><a href="../php_modules/xlswriter">xlswriter</a></td>
<td class="ext_mods_xlswriter_5.2"></td>

View File

@@ -0,0 +1,8 @@
# xhprof
XHProf is a function-level hierarchical profiler for PHP and has a simple HTML based navigational interface. The raw data collection component is implemented in C (as a PHP extension).
| Platform | Url |
|----------|------------------------------------------------------------------|
| GitHub | https://github.com/longxinH/xhprof |
| Pecl | https://pecl.php.net/package/xhprof |

View File

@@ -0,0 +1,9 @@
---
# Available Jinja2 variables:
# ---------------------------
# * {{ php_all_versions }}: Array of all PHP versions
all:
type: pecl

View File

@@ -0,0 +1,24 @@
---
# The name of the module
name: xhprof
# Exclude module build/installation for the following PHP versions
exclude: [5.2, 5.3, 5.4, 5.5, 5.6]
# In order for this module to built correctly against all dependencies,
# the following modules must have been built first.
depends_build: []
# In order for this module to function correctly,
# the following modules must be loaded before.
depends_load: []
# If the following PHP modules are loaded, this module will not behave as expected.
conflicts_load: []
# Enable this module by default via php.ini for PHP cli command?
enabled_php_cli: true
# Enable this module by default via php.ini for PHP-FPM?
enabled_php_fpm: true

View File

@@ -0,0 +1,7 @@
# net-tools
A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system. Includes: arp, hostname, ifconfig, netstat, rarp, route, plipconfig, slattach, mii-tool and iptunnel and ipmaddr.
| Platform | Url |
|----------|------------------------------------------------------------------|
| Website | http://sourceforge.net/projects/net-tools/ |

View File

@@ -0,0 +1,7 @@
---
check: netstat --version | grep net-tools || (netstat --version; false)
all:
type: apt
package: net-tools

View File

@@ -0,0 +1,11 @@
---
# The name of the module
name: net-tools
# Exclude module build/installation for the following PHP versions
exclude: []
# In order for this tool to build/install correctly,
# the following tools must have been installed first.
depends: []