Skip to content

Commit

Permalink
Get rid of PHP_XHPROF, set default PHP_EXTENSIONS_DISABLE to 'xdebug,…
Browse files Browse the repository at this point in the history
…xhprof'
  • Loading branch information
csandanov committed Mar 21, 2024
1 parent c9496a6 commit f765f6e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
4 changes: 3 additions & 1 deletion 8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ ENV PATH="${PATH}:/home/wodby/.composer/vendor/bin:${APP_ROOT}/vendor/bin:${APP_
ENV="/home/wodby/.shrc" \
\
GIT_USER_EMAIL="[email protected]" \
GIT_USER_NAME="wodby"
GIT_USER_NAME="wodby" \
\
PHP_EXTENSIONS_DISABLE='xdebug,xhprof'

ARG TARGETPLATFORM
ARG TARGETARCH
Expand Down
2 changes: 0 additions & 2 deletions 8/templates/docker-php-ext-xhprof.ini.tmpl
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{{- if getenv "PHP_XHPROF" }}
[xhprof]
extension = xhprof.so
xhprof.output_dir = "{{ getenv "PHP_XHPROF_OUTPUT_DIR" "/mnt/files/xhprof" }}"
xhprof.sampling_interval = {{ getenv "PHP_XHPROF_SAMPLING_INTERVAL" "100000" }}
xhprof.collect_additional_info = {{ getenv "PHP_XHPROF_COLLECT_ADDITIONAL_INFO" "0" }}
{{- if getenv "PHP_XHPROF_SAMPLING_DEPTH" }}
xhprof.sampling_depth = {{ getenv "PHP_XHPROF_SAMPLING_DEPTH" }}
{{- end }}
{{- end }}
3 changes: 1 addition & 2 deletions 8/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ services:
image: $IMAGE
environment:
SSH_DISABLE_STRICT_KEY_CHECKING: 1
PHP_XDEBUG: 1
PHP_XDEBUG_MODE: debug
PHP_XHPROF: 1
PHP_EXTENSIONS_DISABLE: ''
PHP_NEWRELIC_ENABLED: 1
ROWS: 80
volumes:
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ The default configuration not recommended for use for production environment:
| [`PHP_SHORT_OPEN_TAG`] | `1` | `1` | `1` |
| _see all sqlsrv ext options_ | - | - | - |
| _see all session options_ | [8.3 session] | [8.2 session] | [8.1 session] |
| `PHP_XHPROF` | | | |
| _see all xhprof options_ | [8.x xhprof] | [8.x xhprof] | [8.x xhprof] |
| [`PHP_UPLOAD_MAX_FILESIZE`] | `32M` | `32M` | `32M` |
| [`PHP_XDEBUG_MODE`] | `off` | `off` | `off` |
Expand Down Expand Up @@ -298,7 +297,7 @@ Legend:
> - "-" - Not exists in this version
> Some extensions may not be available in [`-dev`](#-dev) images
Extensions xdebug and xhprof disabled by default.
Extensions xdebug and xhprof disabled by default, to change it override the default env var `PHP_EXTENSIONS_DISABLE=xdebug,xhprof`.

* sqlsrv extension has no arm64 support because the driver has no support for linux/arm64

Expand Down

0 comments on commit f765f6e

Please sign in to comment.