Skip to content

Commit 31292ca

Browse files
committed
Fix build
1 parent 892ee96 commit 31292ca

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

utils/build/docker/php/apache-mod/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ if [ "$(printf '%s\n' "$PHP_VERSION" "8.2" | sort -V | head -n1)" = "8.2" ] && [
6363
export COMPOSER=composer.gte8.2.json
6464
fi
6565
echo "Using composer config: $COMPOSER"
66-
composer install --prefer-dist
66+
composer install --prefer-dist || composer install --prefer-source
6767

6868
# Install OTel SDK for PHP 8.1+ (open-telemetry/context requires PHP ^8.1)
6969
# DDTrace hooks into the SDK when DD_TRACE_OTEL_ENABLED=true, bridging OTel context
7070
# with DDTrace context so that Baggage::getCurrent() and activate() work correctly.
7171
if [[ "${PHP_MAJOR_VERSION}" -ge 8 ]] && [[ "${PHP_MINOR_VERSION}" -ge 1 ]]; then
72-
composer require "open-telemetry/sdk:^1.0.0" --prefer-dist --no-interaction
72+
composer require "open-telemetry/sdk:^1.0.0" --prefer-dist --no-interaction || composer require "open-telemetry/sdk:^1.0.0" --prefer-source --no-interaction
7373
fi
7474

7575
# Set proper permissions

utils/build/docker/php/weblogs/laravel11x/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
},
2626
"config": {
2727
"optimize-autoloader": true,
28-
"preferred-install": "dist",
2928
"sort-packages": true,
3029
"allow-plugins": {
3130
"pestphp/pest-plugin": true,

0 commit comments

Comments
 (0)