From 23be31f49836c53510c609ec90f1669d521d19ac Mon Sep 17 00:00:00 2001 From: Florian Engelhardt Date: Fri, 24 Jul 2026 13:06:50 +0200 Subject: [PATCH 1/3] fix(ci): renew PHP FTP test certificate --- dockerfiles/ci/bookworm/cert.pem | 50 ++++++++++++++++++++++ dockerfiles/ci/bookworm/php-7.0/Dockerfile | 2 + dockerfiles/ci/bookworm/php-7.1/Dockerfile | 2 + dockerfiles/ci/bookworm/php-7.2/Dockerfile | 2 + dockerfiles/ci/bookworm/php-7.3/Dockerfile | 2 + dockerfiles/ci/bookworm/php-7.4/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.0/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.1/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.2/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.3/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.4/Dockerfile | 2 + dockerfiles/ci/bookworm/php-8.5/Dockerfile | 2 + 12 files changed, 72 insertions(+) create mode 100644 dockerfiles/ci/bookworm/cert.pem diff --git a/dockerfiles/ci/bookworm/cert.pem b/dockerfiles/ci/bookworm/cert.pem new file mode 100644 index 00000000000..9508018e170 --- /dev/null +++ b/dockerfiles/ci/bookworm/cert.pem @@ -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----- diff --git a/dockerfiles/ci/bookworm/php-7.0/Dockerfile b/dockerfiles/ci/bookworm/php-7.0/Dockerfile index ce79de67566..9957ed80735 100644 --- a/dockerfiles/ci/bookworm/php-7.0/Dockerfile +++ b/dockerfiles/ci/bookworm/php-7.0/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-7.1/Dockerfile b/dockerfiles/ci/bookworm/php-7.1/Dockerfile index 97926597e55..b8a36d31e62 100644 --- a/dockerfiles/ci/bookworm/php-7.1/Dockerfile +++ b/dockerfiles/ci/bookworm/php-7.1/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-7.2/Dockerfile b/dockerfiles/ci/bookworm/php-7.2/Dockerfile index 66df6a34a5f..f05055faab7 100644 --- a/dockerfiles/ci/bookworm/php-7.2/Dockerfile +++ b/dockerfiles/ci/bookworm/php-7.2/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-7.3/Dockerfile b/dockerfiles/ci/bookworm/php-7.3/Dockerfile index c02b3b144f7..f8309d2d538 100644 --- a/dockerfiles/ci/bookworm/php-7.3/Dockerfile +++ b/dockerfiles/ci/bookworm/php-7.3/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-7.4/Dockerfile b/dockerfiles/ci/bookworm/php-7.4/Dockerfile index f15f41d7b62..bc0121951d1 100644 --- a/dockerfiles/ci/bookworm/php-7.4/Dockerfile +++ b/dockerfiles/ci/bookworm/php-7.4/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.0/Dockerfile b/dockerfiles/ci/bookworm/php-8.0/Dockerfile index add481710c9..df89e60b637 100644 --- a/dockerfiles/ci/bookworm/php-8.0/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.0/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.1/Dockerfile b/dockerfiles/ci/bookworm/php-8.1/Dockerfile index 087a0f9f9f9..fd0ac67b1eb 100644 --- a/dockerfiles/ci/bookworm/php-8.1/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.1/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.2/Dockerfile b/dockerfiles/ci/bookworm/php-8.2/Dockerfile index 0401cbfa24c..c3a43ec1072 100644 --- a/dockerfiles/ci/bookworm/php-8.2/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.2/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.3/Dockerfile b/dockerfiles/ci/bookworm/php-8.3/Dockerfile index 9df64d84de1..e7e116217e9 100644 --- a/dockerfiles/ci/bookworm/php-8.3/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.3/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.4/Dockerfile b/dockerfiles/ci/bookworm/php-8.4/Dockerfile index 4f3911b0b26..9fd198c2cd1 100644 --- a/dockerfiles/ci/bookworm/php-8.4/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.4/Dockerfile @@ -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"] diff --git a/dockerfiles/ci/bookworm/php-8.5/Dockerfile b/dockerfiles/ci/bookworm/php-8.5/Dockerfile index 6ef866f59fb..521a25e92d0 100644 --- a/dockerfiles/ci/bookworm/php-8.5/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.5/Dockerfile @@ -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"] From 2ae702ac248d15ed59e042b5a2e0c4a89d018423 Mon Sep 17 00:00:00 2001 From: Florian Engelhardt Date: Fri, 24 Jul 2026 13:29:20 +0200 Subject: [PATCH 2/3] ci: bump Bookworm image version to 10 --- dockerfiles/ci/bookworm/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/ci/bookworm/.env b/dockerfiles/ci/bookworm/.env index def4d3a63e9..abdeec0f513 100644 --- a/dockerfiles/ci/bookworm/.env +++ b/dockerfiles/ci/bookworm/.env @@ -1,2 +1,2 @@ -BOOKWORM_CURRENT_VERSION=8 -BOOKWORM_NEXT_VERSION=9 +BOOKWORM_CURRENT_VERSION=9 +BOOKWORM_NEXT_VERSION=10 From 7c898212f7ea7b007397d31ef4b569dd6b350bf2 Mon Sep 17 00:00:00 2001 From: Florian Engelhardt Date: Sat, 25 Jul 2026 11:06:14 +0200 Subject: [PATCH 3/3] ci: migrate Bookworm images to version 10 --- .github/workflows/prof_asan.yml | 4 ++-- .gitlab/generate-appsec.php | 10 +++++----- .gitlab/generate-package.php | 14 +++++++------- .gitlab/generate-profiler.php | 6 +++--- .gitlab/generate-shared.php | 12 ++++++------ .gitlab/generate-tracer.php | 4 ++-- docker-compose.yml | 26 +++++++++++++------------- dockerfiles/ci/bookworm/.env | 4 ++-- tooling/bin/build-debug-artifact | 2 +- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/prof_asan.yml b/.github/workflows/prof_asan.yml index 667f72d8865..b37cbb1ed6c 100644 --- a/.github/workflows/prof_asan.yml +++ b/.github/workflows/prof_asan.yml @@ -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 @@ -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: diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index 20e07ab21ad..64d1d430a93 100644 --- a/.gitlab/generate-appsec.php +++ b/.gitlab/generate-appsec.php @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php index 14a87a7b215..9690bc3f028 100644 --- a/.gitlab/generate-package.php +++ b/.gitlab/generate-package.php @@ -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", ] @@ -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: @@ -397,7 +397,7 @@ function appsec_image_from_tag_mapping(string $tag): string "aggregate tracing extension: []": 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: @@ -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] @@ -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 @@ -1411,7 +1411,7 @@ function appsec_image_from_tag_mapping(string $tag): string variables: VALGRIND: false 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: []" diff --git a/.gitlab/generate-profiler.php b/.gitlab/generate-profiler.php index 72b2300be2b..f256543b22c 100644 --- a/.gitlab/generate-profiler.php +++ b/.gitlab/generate-profiler.php @@ -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 @@ -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 @@ -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 diff --git a/.gitlab/generate-shared.php b/.gitlab/generate-shared.php index 8b34dda9eb0..3bde0add925 100644 --- a/.gitlab/generate-shared.php +++ b/.gitlab/generate-shared.php @@ -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 @@ -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 @@ -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 @@ -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" @@ -122,7 +122,7 @@ needs: [] variables: PHP_MAJOR_MINOR: "" - 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 @@ -185,7 +185,7 @@ ?> "ZAI Shared Tests: []": extends: .tea_test - image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php--shared-ext-9" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php--shared-ext-10" needs: - job: "Build & Test Tea" parallel: diff --git a/.gitlab/generate-tracer.php b/.gitlab/generate-tracer.php index dfa9b68b33f..bf7fbc8f548 100644 --- a/.gitlab/generate-tracer.php +++ b/.gitlab/generate-tracer.php @@ -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 @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index 49e4f6458e5..7c37460562a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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' } diff --git a/dockerfiles/ci/bookworm/.env b/dockerfiles/ci/bookworm/.env index abdeec0f513..ac93017a847 100644 --- a/dockerfiles/ci/bookworm/.env +++ b/dockerfiles/ci/bookworm/.env @@ -1,2 +1,2 @@ -BOOKWORM_CURRENT_VERSION=9 -BOOKWORM_NEXT_VERSION=10 +BOOKWORM_CURRENT_VERSION=10 +BOOKWORM_NEXT_VERSION=11 diff --git a/tooling/bin/build-debug-artifact b/tooling/bin/build-debug-artifact index 97fe09e97a2..13a5903cf6a 100755 --- a/tooling/bin/build-debug-artifact +++ b/tooling/bin/build-debug-artifact @@ -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