Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/prof_asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
CARGO_TARGET_DIR: /tmp/build-cargo
RUST_TOOLCHAIN: nightly-2025-06-13
container:
image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-9
image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-10
# https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
options: --user root

Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
CARGO_TARGET_DIR: /tmp/build-cargo
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
container:
image: datadog/dd-trace-ci:php-8.5_bookworm-9
image: datadog/dd-trace-ci:php-8.5_bookworm-10
options: --user root

steps:
Expand Down
10 changes: 5 additions & 5 deletions .gitlab/generate-appsec.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"test appsec extension":
stage: test
extends: .appsec_test
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_CPU_LIMIT: 3
Expand Down Expand Up @@ -392,7 +392,7 @@
"appsec code coverage":
stage: test
extends: .appsec_test
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 3Gi
Expand Down Expand Up @@ -514,7 +514,7 @@
"appsec lint":
stage: test
extends: .appsec_test
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 9Gi
Expand All @@ -536,7 +536,7 @@
"test appsec helper asan":
stage: test
extends: .appsec_test
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 3
KUBERNETES_MEMORY_REQUEST: 3Gi
Expand All @@ -562,7 +562,7 @@
#"fuzz appsec helper":
# stage: test
# extends: .appsec_test
# image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9
# image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-10
# variables:
# KUBERNETES_CPU_REQUEST: 3
# KUBERNETES_MEMORY_REQUEST: 5Gi
Expand Down
14 changes: 7 additions & 7 deletions .gitlab/generate-package.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
$asan_build_platforms = [
[
"triplet" => "x86_64-unknown-linux-gnu",
"image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-9",
"image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-10",
"arch" => "amd64",
"host_os" => "linux-gnu",
],
[
"triplet" => "aarch64-unknown-linux-gnu",
"image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-9",
"image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-10",
"arch" => "arm64",
"host_os" => "linux-gnu",
]
Expand Down Expand Up @@ -347,7 +347,7 @@ function appsec_image_from_tag_mapping(string $tag): string

"pecl build":
stage: tracing
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-10"
tags: [ "arch:amd64" ]
needs: [ "prepare code" ]
script:
Expand Down Expand Up @@ -397,7 +397,7 @@ function appsec_image_from_tag_mapping(string $tag): string
<?php foreach ($arch_targets as $arch): ?>
"aggregate tracing extension: [<?= $arch ?>]":
stage: tracing
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-10"
tags: [ "arch:amd64" ]
script: ls ./
variables:
Expand Down Expand Up @@ -1195,7 +1195,7 @@ function appsec_image_from_tag_mapping(string $tag): string

"pecl tests":
stage: verify
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_VERSION}_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_VERSION}_bookworm-10"
tags: [ "arch:amd64" ]
services:
- !reference [.services, request-replayer]
Expand Down Expand Up @@ -1228,7 +1228,7 @@ function appsec_image_from_tag_mapping(string $tag): string

"min install tests":
stage: verify
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.0-shared-ext-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.0-shared-ext-10
tags: [ "arch:amd64" ]
variables:
MAX_TEST_PARALLELISM: 8
Expand Down Expand Up @@ -1411,7 +1411,7 @@ function appsec_image_from_tag_mapping(string $tag): string
variables:
VALGRIND: false
ARCH: "<?= $arch ?>"
CONTAINER_SUFFIX: bookworm-9
CONTAINER_SUFFIX: bookworm-10
LOADER_IMAGE_REPO: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci"
needs:
- job: "package loader: [<?= $arch ?>]"
Expand Down
6 changes: 3 additions & 3 deletions .gitlab/generate-profiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"clippy NTS":
stage: test
tags: [ "arch:amd64" ]
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 5
KUBERNETES_CPU_LIMIT: 5
Expand All @@ -109,7 +109,7 @@
"Cargo test":
stage: test
tags: [ "arch:amd64" ]
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.5_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.5_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 5
KUBERNETES_CPU_LIMIT: 5
Expand All @@ -129,7 +129,7 @@
"PHP language tests":
stage: test
tags: [ "arch:${ARCH}" ]
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10
variables:
KUBERNETES_CPU_REQUEST: 5
KUBERNETES_CPU_LIMIT: 5
Expand Down
12 changes: 6 additions & 6 deletions .gitlab/generate-shared.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- IMAGE:
- "centos-7"
- "php-compile-extension-alpine"
- "bookworm-9"
- "bookworm-10"
script:
- if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
- if [ -d "/opt/catch2" ]; then export CMAKE_PREFIX_PATH=/opt/catch2; fi
Expand All @@ -45,7 +45,7 @@
"C components UBSAN":
tags: [ "arch:amd64" ]
stage: test
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-10"
needs: []
script:
- if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
Expand All @@ -69,7 +69,7 @@
"Build & Test Tea":
tags: [ "arch:amd64" ]
stage: build
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10"
parallel:
matrix:
- PHP_MAJOR_MINOR: *no_asan_minor_major_targets
Expand Down Expand Up @@ -98,7 +98,7 @@
.tea_test:
tags: [ "arch:amd64" ]
stage: test
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10"
interruptible: true
rules:
- if: $CI_COMMIT_BRANCH == "master"
Expand All @@ -122,7 +122,7 @@
needs: []
variables:
PHP_MAJOR_MINOR: "<?= $all_minor_major_targets[count($all_minor_major_targets) - 1] ?>"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10"
script:
- |
if ! command -v cc >/dev/null 2>&1 && ! command -v clang >/dev/null 2>&1 && ! command -v gcc >/dev/null 2>&1; then
Expand Down Expand Up @@ -185,7 +185,7 @@
?>
"ZAI Shared Tests: [<?= $major_minor ?>]":
extends: .tea_test
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-<?= $major_minor ?>-shared-ext-9"
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-<?= $major_minor ?>-shared-ext-10"
needs:
- job: "Build & Test Tea"
parallel:
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/generate-tracer.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function before_script_steps($with_docker_auth = false) {
"compile extension: debug":
stage: compile
tags: [ "arch:${ARCH}" ]
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10
parallel:
matrix:
- PHP_MAJOR_MINOR: *all_minor_major_targets
Expand Down Expand Up @@ -193,7 +193,7 @@ function before_script_steps($with_docker_auth = false) {
.base_test:
stage: test
tags: [ "arch:${ARCH}" ]
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9
image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-10
timeout: 60m
interruptible: true
rules:
Expand Down
26 changes: 13 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ services:
# --- Alpine ---
'8.0-alpine': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0_alpine' }
# --- Bookworm ---
'7.0-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.0_bookworm-9' }
'7.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_bookworm-9' }
'7.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.2_bookworm-9' }
'7.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.3_bookworm-9' }
'7.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4_bookworm-9' }
'7.4-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4-shared-ext-9' }
'8.0-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0_bookworm-9' }
'8.0-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0-shared-ext-9' }
'8.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.1_bookworm-9' }
'8.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.2_bookworm-9' }
'8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-9' }
'8.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.4_bookworm-9' }
'8.5-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.5_bookworm-9' }
'7.0-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.0_bookworm-10' }
'7.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_bookworm-10' }
'7.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.2_bookworm-10' }
'7.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.3_bookworm-10' }
'7.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4_bookworm-10' }
'7.4-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4-shared-ext-10' }
'8.0-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0_bookworm-10' }
'8.0-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0-shared-ext-10' }
'8.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.1_bookworm-10' }
'8.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.2_bookworm-10' }
'8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-10' }
'8.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.4_bookworm-10' }
'8.5-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.5_bookworm-10' }
# --- CentOS 6 ---
'7.0-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.0_centos-7' }
'7.1-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_centos-7' }
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/ci/bookworm/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
BOOKWORM_CURRENT_VERSION=8
BOOKWORM_NEXT_VERSION=9
BOOKWORM_CURRENT_VERSION=10
BOOKWORM_NEXT_VERSION=11
50 changes: 50 additions & 0 deletions dockerfiles/ci/bookworm/cert.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
-----BEGIN CERTIFICATE-----
MIIDlTCCAn2gAwIBAgIUb9Avckyt1MHYsaBDGCpNBX2DtJowDQYJKoZIhvcNAQEL
BQAwWTESMBAGA1UEAwwJMTI3LjAuMC4xMQswCQYDVQQGEwJBVTETMBEGA1UECAwK
U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMCAX
DTI1MDEwMTAwMDAwMFoYDzIwOTkxMjMxMjM1OTU5WjBZMRIwEAYDVQQDDAkxMjcu
MC4wLjExCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQK
DBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQDChB5LljS2j20SXa+VHvEpsjmPtLEiuel4CDibe0v2yMBXzX+U
FhHUutrMSVpLRnk2s+WJ8voBPb7jTICm3u5VYnOjbmWAyC5ViuGhBNdhxOMCjiJs
3qEauNu+oQDS3cQeEVBHK4U05fxOKaXS+B3r1FvIiJUjj7yf5RfT1Rw3EvV5oDLj
fgv53tfD6CdQPf3d7XR5NdkZmiP/GDgNBkiaW/u/8i424l1TWHTd878CdxXUhZo5
Cmu2ZoJm/JsVrnJ2FdovE3N+R+0FtKbaZZYK60R0jFb95oSzJI11IRK+Leij+4dS
2c5nlkS+7Ew3/1VlHZJt99aoD2JPh2Ea+56PAgMBAAGjUzBRMB0GA1UdDgQWBBQ2
qPSBOmDn3biSI5Nhc5mdcUUrtjAfBgNVHSMEGDAWgBQ2qPSBOmDn3biSI5Nhc5md
cUUrtjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCgQgPjZDV4
xJySpf18XqnuQlteoxFQIFEe3edg7W7aC9E4g6L9ZtqnopmSDw1+RRT2bzBc1Uuz
MSs77OJlnM/OxrEBqP73GZXG5VvnOj36d4ZVJjh5NWBTdqegkNhkyMOBHLpGLWMv
wYOzXew4Q1yH6iIxZGUUu/BdV+cr933pAFZSaEGrXWWiYL2WI0eirALrMleuZpXL
qaQfMX8dnFrIzo7lkXZIPQjAkeL6HleJPIW6WhoLvhxAyOU1vPzNmXRjFItiMQqN
o567EM5VXKsJ40L27NfslzrgGA7SO6aiALoITX3zSZJ7qyNi9c5wpl1jKqspprjk
PWgM+zxSgE3x
-----END CERTIFICATE-----
-----BEGIN PRIVATE KEY-----
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDChB5LljS2j20S
Xa+VHvEpsjmPtLEiuel4CDibe0v2yMBXzX+UFhHUutrMSVpLRnk2s+WJ8voBPb7j
TICm3u5VYnOjbmWAyC5ViuGhBNdhxOMCjiJs3qEauNu+oQDS3cQeEVBHK4U05fxO
KaXS+B3r1FvIiJUjj7yf5RfT1Rw3EvV5oDLjfgv53tfD6CdQPf3d7XR5NdkZmiP/
GDgNBkiaW/u/8i424l1TWHTd878CdxXUhZo5Cmu2ZoJm/JsVrnJ2FdovE3N+R+0F
tKbaZZYK60R0jFb95oSzJI11IRK+Leij+4dS2c5nlkS+7Ew3/1VlHZJt99aoD2JP
h2Ea+56PAgMBAAECggEAWDGUFNxxYRbNsuaUbi3d1XRwAdbA+8hEcX50wBZavnWO
NCFCB5AsHIJuIvLdREUbP3C4kd//d6GZ07BDoqVwdXlSihbLYeUhkPqLy7iIuVUO
QoHUXP1iGV4YkCmq2HDhc2qRNfunBXGDgKMEgw+pbVxXEyjOShXpRawXLh4xkUw1
tGdgt4WSufui+5vCEQed1zrq1Q3vImZTJkoqyHwbc/VyirZsPP5jexRtJeAoS4cc
6IJntjN7SKQRu/S6bAm4OdX2ArCbeOZ3ss1wycENpLz4md25Sr7J+uszDQRS3JZS
buG7N1Ihm0oY3aMGCF10Q0yEU5pKqzLaAyoBE4rF0QKBgQDzGmwyZ9chHL5Zut+5
s5AQchY+8kIZ1Ud35VzkqlE9S8JOsDmfAP4WR4DntqIPbE2F+9tNt1+hrQztfCG3
in1FXX3nzJe7Sk93GMPsYC+lIBTmB09weXlbP7P9J2i0jVAUpHo1Pa1C+NVy2dOk
cU81vmVea6EJ9dBJYNVgdLeI/wKBgQDM1dXdkxibfqBqz/i4jvzywn/9yC5GEWXr
IRUKbxwiuirylNUQSlFKrqRpxay495FnJpwSs3qxvYGWiXAGgtIy1VluWWolrqG4
gbnL3aDrHeC8BmTcfCnjIYGl7ACBTJFH4qR1FzMt2FYm+lI0SwGrvinqbLUF5dW4
uHzRbbHacQKBgQDqh+E+N8PqJArYEltokn04AHjJvXpb5dEPMG4QBOhfVElfFNBi
P9jhsZYA9ccfTgL0ceg+79wI5CSGsKzun2L/mpSvHkh73dMQOQo7bwhIK809pmvT
PL4BdFG2t2BiX7qUT6G+34PaCqoSJWfzS4V5effdwcQZEdciE5OHfNLcDQKBgQCS
mRgPFI+v+dhlmaKws+Vk+L8Rqoszqo/+0BZ2+T5xvDuwkcRLfGThxkv1R3xuhQCT
ipZ46+sL+k0cqBB9GHPH3dm7mFLX1Tv5CR8oQN5CZ4fICet1wYdY/0oCrf1OjLYN
dK+u/YOrdAF0tALRWj0/5UGqfVKxfeSP57mtSYzYgQKBgQChNy3y9sFp4WcRBjWE
2IJtTMD682rrxnJQCND6tOgYi+8hGCnbt9wJes4Z73UjTMwNDohImOaC9VImPVYC
GdSaWzpHru18PcKExq6SFRYbZXagwCXMAXB4v17h/Vm4PsjJZFTgrnFTb5FUIMDR
yaWMV5Lt8jgV/NINDPcq2P58Ow==
-----END PRIVATE KEY-----
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-7.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-7.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-7.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 2 additions & 0 deletions dockerfiles/ci/bookworm/php-8.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,6 @@ RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

USER circleci

COPY --chown=circleci:circleci cert.pem $PHP_SRC_DIR/ext/ftp/tests/cert.pem

CMD ["php-fpm", "-F"]
2 changes: 1 addition & 1 deletion tooling/bin/build-debug-artifact
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ case "$php_version" in
esac

# ─── Docker image selection ───────────────────────────────────────────────────
BOOKWORM_VERSION=9
BOOKWORM_VERSION=10
if [[ "$libc" == "musl" ]]; then
DOCKER_IMAGE="datadog/dd-trace-ci:php-compile-extension-alpine-${php_version}"
else
Expand Down
Loading