Skip to content

Support PHP local build testing on ARM Mac #6512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bm1549 merged 6 commits into from
Mar 17, 2026
Merged

Support PHP local build testing on ARM Mac #6512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da70bc2
Support PHP local build testing on ARM Mac
bm1549 Mar 16, 2026
7b6b7b6
Use bookworm base image for PHP parametric, drop warning stripping
bm1549 Mar 17, 2026
14b0d90
Merge branch 'main' into brian.marks/arm-mac-php-local-build
bm1549 Mar 17, 2026
56439b6
Merge branch 'main' into brian.marks/arm-mac-php-local-build
bm1549 Mar 17, 2026
318bcf8
Merge branch 'main' into brian.marks/arm-mac-php-local-build
bm1549 Mar 17, 2026
d7b4071
chore: trigger CI rerun
bm1549 Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion utils/build/docker/php/common/install_ddtrace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,21 @@ fi
EXTRA_ARGS=""
PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;")
if [ "$(printf '%s\n' "7.1" "$PHP_VERSION" | sort -V | head -n1)" = "7.1" ]; then
EXTRA_ARGS="--enable-profiling"
# Only enable profiling if the bundle actually contains a profiling extension.
# When installing from a local package that was built without profiling support,
# passing --enable-profiling causes datadog-setup.php to exit with an error.
PKG_HAS_PROFILING=0
if [ -n "${PKG:-}" ]; then
if tar -tzf "$PKG" 2>/dev/null | grep -q "datadog-profiling"; then
PKG_HAS_PROFILING=1
fi
else
# Downloading from GitHub releases always includes profiling
PKG_HAS_PROFILING=1
fi
if [ "$PKG_HAS_PROFILING" = "1" ]; then
EXTRA_ARGS="--enable-profiling"
fi
fi

INI_FILE=/etc/php/php.ini
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/php/parametric/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM datadog/dd-trace-ci:php-8.2_buster
FROM datadog/dd-trace-ci:php-8.2_bookworm-6
RUN switch-php nts
WORKDIR /binaries
ENV DD_TRACE_CLI_ENABLED=1
Expand Down
Loading