Skip to content

Commit 48633b8

Browse files
bm1549claude
andcommitted
Remove PHP infra changes (moved to #6512)
The install_ddtrace.sh profiling fix and parametric Dockerfile bookworm change are handled by #6512. This PR now only contains the prepare-local-build.sh script. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent c9b43db commit 48633b8

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

utils/build/docker/php/common/install_ddtrace.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ fi
4141

4242
EXTRA_ARGS=""
4343
PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;")
44-
# Only enable profiling if the package actually contains the profiling extension
45-
if [ "$(printf '%s\n' "7.1" "$PHP_VERSION" | sort -V | head -n1)" = "7.1" ] \
46-
&& [ -n "${PKG:-}" ] && tar tzf "$PKG" 2>/dev/null | grep -q profiling; then
44+
if [ "$(printf '%s\n' "7.1" "$PHP_VERSION" | sort -V | head -n1)" = "7.1" ]; then
4745
EXTRA_ARGS="--enable-profiling"
4846
fi
4947

utils/build/docker/php/parametric/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM datadog/dd-trace-ci:php-8.2_bookworm-6
2+
FROM datadog/dd-trace-ci:php-8.2_buster
33
RUN switch-php nts
44
WORKDIR /binaries
55
ENV DD_TRACE_CLI_ENABLED=1

0 commit comments

Comments
 (0)