diff --git a/.github/workflows/prof_asan.yml b/.github/workflows/prof_asan.yml index 78019c658d1..46c8fe591e3 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-8 + image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-9 # 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-8 + image: datadog/dd-trace-ci:php-8.5_bookworm-9 options: --user root steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7d512b1dc1..c142347f552 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ stages: - tests - deploy - ci-build + - ci-publish variables: GIT_SUBMODULE_STRATEGY: recursive diff --git a/.gitlab/ci-images.yml b/.gitlab/ci-images.yml index c2b725f7d44..1f76f673b7c 100644 --- a/.gitlab/ci-images.yml +++ b/.gitlab/ci-images.yml @@ -6,7 +6,9 @@ variables: value: "" description: "Your docker hub personal access token, can be created following this doc https://docs.docker.com/docker-hub/access-tokens/#create-an-access-token" CI_REGISTRY: - value: "docker.io" + value: "registry.ddbuild.io" + CI_REGISTRY_IMAGE: + value: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci" CentOS: stage: ci-build @@ -36,7 +38,28 @@ CentOS: - php-7.0 script: - cd dockerfiles/ci/centos/7 - - echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" + - | + LOGIN_SERVER=$(echo "$CI_REGISTRY" | cut -d'/' -f1) + if [ "$LOGIN_SERVER" = "registry.ddbuild.io" ]; then + echo "Using pre-configured runner credentials for registry.ddbuild.io" + elif echo "$LOGIN_SERVER" | grep -q "dkr.ecr"; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + if ! command -v aws >/dev/null 2>&1; then + ARCH=$(uname -m) + if [ "$ARCH" = "x86_64" ]; then + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" + else + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip" + fi + unzip -q awscliv2.zip + ./aws/install >/dev/null + rm -rf aws awscliv2.zip + fi + aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "$LOGIN_SERVER" + elif [ -n "$CI_REGISTRY_TOKEN" ]; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$LOGIN_SERVER" + fi - docker buildx bake --no-cache --pull --push $PHP_VERSION Alpine: @@ -67,7 +90,28 @@ Alpine: - 7.0-alpine script: - cd dockerfiles/ci/alpine_compile_extension - - echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" + - | + LOGIN_SERVER=$(echo "$CI_REGISTRY" | cut -d'/' -f1) + if [ "$LOGIN_SERVER" = "registry.ddbuild.io" ]; then + echo "Using pre-configured runner credentials for registry.ddbuild.io" + elif echo "$LOGIN_SERVER" | grep -q "dkr.ecr"; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + if ! command -v aws >/dev/null 2>&1; then + ARCH=$(uname -m) + if [ "$ARCH" = "x86_64" ]; then + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" + else + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip" + fi + unzip -q awscliv2.zip + ./aws/install >/dev/null + rm -rf aws awscliv2.zip + fi + aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "$LOGIN_SERVER" + elif [ -n "$CI_REGISTRY_TOKEN" ]; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$LOGIN_SERVER" + fi - docker buildx bake --no-cache --pull --push $PHP_VERSION Bookworm: @@ -81,11 +125,11 @@ Bookworm: image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble variables: DDCI_CONFIGURE_OTEL_EXPORTER: "true" + MAKE_JOBS: "2" parallel: matrix: - PHP_VERSION: - base - - PHP_VERSION: - php-8.5 - php-8.4 - php-8.3 @@ -99,10 +143,30 @@ Bookworm: - php-7.2 - php-7.1 - php-7.0 - MAKE_JOBS: ["2"] script: - cd dockerfiles/ci/bookworm - - echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" + - | + LOGIN_SERVER=$(echo "$CI_REGISTRY" | cut -d'/' -f1) + if [ "$LOGIN_SERVER" = "registry.ddbuild.io" ]; then + echo "Using pre-configured runner credentials for registry.ddbuild.io" + elif echo "$LOGIN_SERVER" | grep -q "dkr.ecr"; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + if ! command -v aws >/dev/null 2>&1; then + ARCH=$(uname -m) + if [ "$ARCH" = "x86_64" ]; then + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" + else + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip" + fi + unzip -q awscliv2.zip + ./aws/install >/dev/null + rm -rf aws awscliv2.zip + fi + aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "$LOGIN_SERVER" + elif [ -n "$CI_REGISTRY_TOKEN" ]; then + mkdir -p ~/.docker && echo '{"auths":{}}' > ~/.docker/config.json + echo "$CI_REGISTRY_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$LOGIN_SERVER" + fi - docker buildx bake --no-cache --pull --push $PHP_VERSION .windows_image_build: @@ -168,7 +232,14 @@ Bookworm: New-Item -ItemType Directory -Force -Path $env:DOCKER_CONFIG | Out-Null Set-Content -Encoding ascii -Path (Join-Path $env:DOCKER_CONFIG "config.json") -Value '{"auths":{}}' - $env:CI_REGISTRY_TOKEN | docker login -u "$env:CI_REGISTRY_USER" --password-stdin "$env:CI_REGISTRY" + $loginServer = $env:CI_REGISTRY.Split('/')[0] + if ($loginServer -eq "registry.ddbuild.io") { + Write-Host "Using pre-configured runner credentials for registry.ddbuild.io" + } elseif ($loginServer -like "*dkr.ecr*") { + aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "$loginServer" + } elseif ($env:CI_REGISTRY_TOKEN) { + $env:CI_REGISTRY_TOKEN | docker login -u "$env:CI_REGISTRY_USER" --password-stdin "$loginServer" + } if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } docker version @@ -212,3 +283,129 @@ Bookworm: - "php-7.4" - "php-7.3" - "php-7.2" + +Publish CentOS: + stage: ci-publish + rules: + - when: manual + allow_failure: true + needs: + - job: CentOS + trigger: + project: DataDog/public-images + branch: main + parallel: + matrix: + - TAG_NAME: + - "centos-7" + - "php-8.5_centos-7" + - "php-8.4_centos-7" + - "php-8.3_centos-7" + - "php-8.2_centos-7" + - "php-8.1_centos-7" + - "php-8.0_centos-7" + - "php-7.4_centos-7" + - "php-7.3_centos-7" + - "php-7.2_centos-7" + - "php-7.1_centos-7" + - "php-7.0_centos-7" + variables: + IMG_SOURCES: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:${TAG_NAME}" + IMG_DESTINATIONS: "dd-trace-ci:${TAG_NAME}" + IMG_REGISTRIES: "dockerhub" + +Publish Bookworm: + stage: ci-publish + rules: + - when: manual + allow_failure: true + needs: + - job: Bookworm + trigger: + project: DataDog/public-images + branch: main + parallel: + matrix: + - TAG_NAME: + - "bookworm-9" + - "php-8.5_bookworm-9" + - "php-8.4_bookworm-9" + - "php-8.3_bookworm-9" + - "php-8.2_bookworm-9" + - "php-8.1_bookworm-9" + - "php-8.0_bookworm-9" + - "php-8.0-shared-ext-9" + - "php-7.4_bookworm-9" + - "php-7.4-shared-ext-9" + - "php-7.3_bookworm-9" + - "php-7.2_bookworm-9" + - "php-7.1_bookworm-9" + - "php-7.0_bookworm-9" + variables: + IMG_SOURCES: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:${TAG_NAME}" + IMG_DESTINATIONS: "dd-trace-ci:${TAG_NAME}" + IMG_REGISTRIES: "dockerhub" + +Publish Alpine: + stage: ci-publish + rules: + - when: manual + allow_failure: true + needs: + - job: Alpine + trigger: + project: DataDog/public-images + branch: main + parallel: + matrix: + - TAG_NAME: + - "php-compile-extension-alpine" + - "php-compile-extension-alpine-8.5" + - "php-compile-extension-alpine-8.4" + - "php-compile-extension-alpine-8.3" + - "php-compile-extension-alpine-8.2" + - "php-compile-extension-alpine-8.1" + - "php-compile-extension-alpine-8.0" + - "php-compile-extension-alpine-7.4" + - "php-compile-extension-alpine-7.3" + - "php-compile-extension-alpine-7.2" + - "php-compile-extension-alpine-7.1" + - "php-compile-extension-alpine-7.0" + variables: + IMG_SOURCES: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:${TAG_NAME}" + IMG_DESTINATIONS: "dd-trace-ci:${TAG_NAME}" + IMG_REGISTRIES: "dockerhub" + +Publish Windows: + stage: ci-publish + rules: + - when: manual + allow_failure: true + needs: + - job: "Windows 1: Tool Images" + - job: "Windows 2: PHP Images" + trigger: + project: DataDog/public-images + branch: main + parallel: + matrix: + - TAG_NAME: + - "windows-base-vc15" + - "windows-base-vs16" + - "windows-base-vs17" + - "windows-vc15" + - "windows-vs16" + - "windows-vs17" + - "php-8.5_windows" + - "php-8.4_windows" + - "php-8.3_windows" + - "php-8.2_windows" + - "php-8.1_windows" + - "php-8.0_windows" + - "php-7.4_windows" + - "php-7.3_windows" + - "php-7.2_windows" + variables: + IMG_SOURCES: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:${TAG_NAME}" + IMG_DESTINATIONS: "dd-trace-ci:${TAG_NAME}" + IMG_REGISTRIES: "dockerhub" diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index 81f4df374c3..43dbddd6020 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/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9 variables: KUBERNETES_CPU_REQUEST: 3 KUBERNETES_CPU_LIMIT: 3 @@ -393,7 +393,7 @@ "appsec code coverage": stage: test extends: .appsec_test - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-9 variables: KUBERNETES_CPU_REQUEST: 3 KUBERNETES_MEMORY_REQUEST: 3Gi @@ -515,7 +515,7 @@ "appsec lint": stage: test extends: .appsec_test - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.3_bookworm-9 variables: KUBERNETES_CPU_REQUEST: 3 KUBERNETES_MEMORY_REQUEST: 9Gi @@ -537,7 +537,7 @@ "test appsec helper asan": stage: test extends: .appsec_test - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9 variables: KUBERNETES_CPU_REQUEST: 3 KUBERNETES_MEMORY_REQUEST: 3Gi @@ -563,7 +563,7 @@ #"fuzz appsec helper": # stage: test # extends: .appsec_test -# image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-8 +# image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9 # variables: # KUBERNETES_CPU_REQUEST: 3 # KUBERNETES_MEMORY_REQUEST: 5Gi diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php index 2272b5fc7fa..35f36595fc1 100644 --- a/.gitlab/generate-package.php +++ b/.gitlab/generate-package.php @@ -5,7 +5,7 @@ $build_platforms = [ [ "triplet" => "x86_64-alpine-linux-musl", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-compile-extension-alpine-%s", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-compile-extension-alpine-%s", "arch" => "amd64", "host_os" => "linux-musl", "targets" => [ @@ -14,7 +14,7 @@ ], [ "triplet" => "aarch64-alpine-linux-musl", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-compile-extension-alpine-%s", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-compile-extension-alpine-%s", "arch" => "arm64", "host_os" => "linux-musl", "targets" => [ @@ -23,7 +23,7 @@ ], [ "triplet" => "x86_64-unknown-linux-gnu", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_centos-7", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_centos-7", "arch" => "amd64", "host_os" => "linux-gnu", "targets" => [ @@ -34,7 +34,7 @@ ], [ "triplet" => "aarch64-unknown-linux-gnu", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_centos-7", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_centos-7", "arch" => "arm64", "host_os" => "linux-gnu", "targets" => [ @@ -48,13 +48,13 @@ $asan_build_platforms = [ [ "triplet" => "x86_64-unknown-linux-gnu", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-8", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-9", "arch" => "amd64", "host_os" => "linux-gnu", ], [ "triplet" => "aarch64-unknown-linux-gnu", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-8", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_bookworm-9", "arch" => "arm64", "host_os" => "linux-gnu", ] @@ -63,7 +63,7 @@ $windows_build_platforms = [ [ "triplet" => "x86_64-pc-windows-msvc", - "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_windows", + "image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_windows", "arch" => "amd64", "host_os" => "windows-msvc", "targets" => [ @@ -321,7 +321,7 @@ "pecl build": stage: tracing - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-9" tags: [ "arch:amd64" ] needs: [ "prepare code" ] script: @@ -371,7 +371,7 @@ "aggregate tracing extension: []": stage: tracing - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-7.4_bookworm-9" tags: [ "arch:amd64" ] script: ls ./ variables: @@ -770,7 +770,7 @@ "x-profiling phpt tests on Alpine": stage: verify - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-compile-extension-alpine-$PHP_VERSION" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-compile-extension-alpine-$PHP_VERSION" tags: [ "arch:amd64" ] parallel: matrix: @@ -1154,7 +1154,7 @@ "pecl tests": stage: verify - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_VERSION}_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_VERSION}_bookworm-9" tags: [ "arch:amd64" ] services: - !reference [.services, request-replayer] @@ -1187,7 +1187,7 @@ "min install tests": stage: verify - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.0-shared-ext-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.0-shared-ext-9 tags: [ "arch:amd64" ] variables: MAX_TEST_PARALLELISM: 8 @@ -1365,12 +1365,12 @@ "Loader test on libc": stage: verify - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${MAJOR_MINOR}_${CONTAINER_SUFFIX}" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${MAJOR_MINOR}_${CONTAINER_SUFFIX}" tags: [ "arch:$ARCH" ] variables: VALGRIND: false ARCH: "" - CONTAINER_SUFFIX: bookworm-8 + CONTAINER_SUFFIX: bookworm-9 needs: - job: "package loader: []" artifacts: true diff --git a/.gitlab/generate-profiler.php b/.gitlab/generate-profiler.php index 2268cd44c44..3877627c16a 100644 --- a/.gitlab/generate-profiler.php +++ b/.gitlab/generate-profiler.php @@ -16,7 +16,7 @@ "profiling tests": stage: test tags: [ "arch:${ARCH}" ] - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:${IMAGE_PREFIX}${PHP_MAJOR_MINOR}${IMAGE_SUFFIX} + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:${IMAGE_PREFIX}${PHP_MAJOR_MINOR}${IMAGE_SUFFIX} # Setting the *_REQUEST and *_LIMIT variables to be the same, and setting # them for both the build and helper allows using Guaranteed QoS instead of # Burstable. This means nproc and similar tools will work as expected. @@ -83,7 +83,7 @@ "clippy NTS": stage: test tags: [ "arch:amd64" ] - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9 variables: KUBERNETES_CPU_REQUEST: 5 KUBERNETES_MEMORY_REQUEST: 3Gi @@ -102,7 +102,7 @@ "Cargo test": stage: test tags: [ "arch:amd64" ] - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.5_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-8.5_bookworm-9 variables: KUBERNETES_CPU_REQUEST: 5 KUBERNETES_MEMORY_REQUEST: 3Gi diff --git a/.gitlab/generate-shared.php b/.gitlab/generate-shared.php index d3f5f0a4f0f..46ebf4ac56b 100644 --- a/.gitlab/generate-shared.php +++ b/.gitlab/generate-shared.php @@ -21,7 +21,7 @@ - IMAGE: - "datadog/dd-trace-ci:centos-7" - "datadog/dd-trace-ci:php-compile-extension-alpine" - - "datadog/dd-trace-ci:bookworm-8" + - "datadog/dd-trace-ci:bookworm-9" 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/images/mirror/datadog/dd-trace-ci:bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:bookworm-9" 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/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9" 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/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9" interruptible: true rules: - if: $CI_COMMIT_BRANCH == "master" @@ -122,7 +122,7 @@ needs: [] variables: PHP_MAJOR_MINOR: "" - image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9" 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/images/mirror/datadog/dd-trace-ci:php--shared-ext-8" + image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php--shared-ext-9" needs: - job: "Build & Test Tea" parallel: diff --git a/.gitlab/generate-tracer.php b/.gitlab/generate-tracer.php index 758881d56bb..546e9aca22b 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/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9 parallel: matrix: - PHP_MAJOR_MINOR: *all_minor_major_targets @@ -119,7 +119,7 @@ function before_script_steps($with_docker_auth = false) { variables: CONTAINER_NAME: $CI_JOB_NAME_SLUG GIT_STRATEGY: none - IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows" + IMAGE: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows" script: | @@ -186,7 +186,7 @@ function before_script_steps($with_docker_auth = false) { .base_test: stage: test tags: [ "arch:${ARCH}" ] - image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-8 + image: registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-9 timeout: 60m interruptible: true rules: diff --git a/docker-compose.yml b/docker-compose.yml index 5c8542a2b73..49e4f6458e5 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-8' } - '7.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_bookworm-8' } - '7.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.2_bookworm-8' } - '7.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.3_bookworm-8' } - '7.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4_bookworm-8' } - '7.4-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.4-shared-ext-8' } - '8.0-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0_bookworm-8' } - '8.0-bookworm-shared-ext': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.0-shared-ext-8' } - '8.1-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.1_bookworm-8' } - '8.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.2_bookworm-8' } - '8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-8' } - '8.4-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.4_bookworm-8' } - '8.5-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.5_bookworm-8' } + '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' } # --- 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/alpine/docker-compose.yml b/dockerfiles/ci/alpine/docker-compose.yml index 525bb61fb44..eb4015cd527 100644 --- a/dockerfiles/ci/alpine/docker-compose.yml +++ b/dockerfiles/ci/alpine/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: base: - image: datadog/dd-trace-ci:alpine + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:alpine build: context: . x-bake: &bake @@ -12,7 +12,7 @@ services: - linux/amd64 php-8.0: - image: datadog/dd-trace-ci:php-8.0_alpine + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.0_alpine build: context: ./php-8.0 args: diff --git a/dockerfiles/ci/alpine/php-8.0/Dockerfile b/dockerfiles/ci/alpine/php-8.0/Dockerfile index 4ecb3c521d7..1017f7b4634 100644 --- a/dockerfiles/ci/alpine/php-8.0/Dockerfile +++ b/dockerfiles/ci/alpine/php-8.0/Dockerfile @@ -1,4 +1,5 @@ -FROM datadog/dd-trace-ci:alpine AS base +ARG CI_REGISTRY_IMAGE=datadog/dd-trace-ci +FROM ${CI_REGISTRY_IMAGE}:alpine AS base ARG phpVersion ENV PHP_INSTALL_DIR_DEBUG_ZTS=${PHP_INSTALL_DIR}/${phpVersion}-debug-zts diff --git a/dockerfiles/ci/alpine_compile_extension/Dockerfile b/dockerfiles/ci/alpine_compile_extension/Dockerfile index a7a694ec532..da8045e2ca5 100644 --- a/dockerfiles/ci/alpine_compile_extension/Dockerfile +++ b/dockerfiles/ci/alpine_compile_extension/Dockerfile @@ -1,4 +1,5 @@ -FROM datadog/dd-trace-ci:php-compile-extension-alpine +ARG CI_REGISTRY_IMAGE=datadog/dd-trace-ci +FROM ${CI_REGISTRY_IMAGE}:php-compile-extension-alpine ADD 0001-Backport-0a39890c-Fix-libxml2-2.12-build-due-to-API-.patch /patches/0001-Backport-0a39890c-Fix-libxml2-2.12-build-due-to-API-.patch ADD 0001-Sync-callback-signature-with-libxml2-2.9.8.patch /patches/0001-Sync-callback-signature-with-libxml2-2.9.8.patch diff --git a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml index 52892420c92..6ac3817ff0b 100644 --- a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml +++ b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: base-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine build: context: . dockerfile: base.Dockerfile @@ -15,7 +15,7 @@ services: - ../../:/app 7.0-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-7.0 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-7.0 build: context: . x-bake: *bake @@ -27,7 +27,7 @@ services: - ../../:/app 7.1-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-7.1 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-7.1 build: context: . x-bake: *bake @@ -39,7 +39,7 @@ services: - ../../:/app 7.2-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-7.2 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-7.2 build: context: . x-bake: *bake @@ -51,7 +51,7 @@ services: - ../../:/app 7.3-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-7.3 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-7.3 build: context: . x-bake: *bake @@ -63,7 +63,7 @@ services: - ../../:/app 7.4-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-7.4 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-7.4 build: context: . x-bake: *bake @@ -75,7 +75,7 @@ services: - ../../:/app 8.0-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.0 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.0 build: context: . x-bake: *bake @@ -87,7 +87,7 @@ services: - ../../:/app 8.1-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.1 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.1 build: context: . x-bake: *bake @@ -99,7 +99,7 @@ services: - ../../:/app 8.2-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.2 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.2 build: context: . x-bake: *bake @@ -111,7 +111,7 @@ services: - ../../:/app 8.3-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.3 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.3 build: context: . x-bake: *bake @@ -123,7 +123,7 @@ services: - ../../:/app 8.4-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.4 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.4 build: context: . x-bake: *bake @@ -135,7 +135,7 @@ services: - ../../:/app 8.5-alpine: - image: datadog/dd-trace-ci:php-compile-extension-alpine-8.5 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-compile-extension-alpine-8.5 build: context: . x-bake: *bake diff --git a/dockerfiles/ci/bookworm/build-extensions.sh b/dockerfiles/ci/bookworm/build-extensions.sh index a619baaba14..b7f44f5784b 100755 --- a/dockerfiles/ci/bookworm/build-extensions.sh +++ b/dockerfiles/ci/bookworm/build-extensions.sh @@ -11,6 +11,8 @@ if [[ -z "${MAKE_JOBS:-}" || "${MAKE_JOBS}" == "0" ]]; then MAKE_JOBS="$(nproc)" fi +export MAKEFLAGS="-j$MAKE_JOBS" + XDEBUG_VERSIONS=(-3.1.2) if [[ $PHP_VERSION_ID -le 70 ]]; then XDEBUG_VERSIONS=(-2.7.2) diff --git a/dockerfiles/ci/bookworm/docker-compose.yml b/dockerfiles/ci/bookworm/docker-compose.yml index 8f167dfb7e6..0f6a789fb6f 100644 --- a/dockerfiles/ci/bookworm/docker-compose.yml +++ b/dockerfiles/ci/bookworm/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: base: - image: datadog/dd-trace-ci:bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:bookworm-$BOOKWORM_NEXT_VERSION build: context: . x-bake: &bake @@ -11,11 +11,11 @@ services: - linux/arm64 - linux/amd64 args: &build-base - BUILD_BASE: datadog/dd-trace-ci:bookworm-$BOOKWORM_NEXT_VERSION + BUILD_BASE: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:bookworm-$BOOKWORM_NEXT_VERSION MAKE_JOBS: ${MAKE_JOBS:-} php-8.5: - image: datadog/dd-trace-ci:php-8.5_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.5_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.5/Dockerfile @@ -27,7 +27,7 @@ services: phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" php-8.4: - image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.4/Dockerfile @@ -39,7 +39,7 @@ services: phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" php-8.3: - image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.3/Dockerfile @@ -51,7 +51,7 @@ services: phpSha256Hash: "4e7baaf0a690e954a20e7ced3dd633ce8cb8094e2b6b612a55e703ecbbdcbf4f" php-8.2: - image: datadog/dd-trace-ci:php-8.2_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.2_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.2/Dockerfile @@ -63,7 +63,7 @@ services: phpSha256Hash: "083c2f61cc5f527eb293c4c468a91af46a9678785957e023b2796a9db290d870" php-8.1: - image: datadog/dd-trace-ci:php-8.1_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.1_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.1/Dockerfile @@ -75,7 +75,7 @@ services: phpSha256Hash: "4846836d1de27dbd28e89180f073531087029a77e98e8e019b7b2eddbdb1baff" php-8.0: - image: datadog/dd-trace-ci:php-8.0_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.0_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.0/Dockerfile @@ -87,7 +87,7 @@ services: phpSha256Hash: "449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c" php-8.0-shared-ext: - image: datadog/dd-trace-ci:php-8.0-shared-ext-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.0-shared-ext-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-8.0/Dockerfile @@ -100,7 +100,7 @@ services: phpSha256Hash: "449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c" php-7.4: - image: datadog/dd-trace-ci:php-7.4_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.4_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.4/Dockerfile @@ -112,7 +112,7 @@ services: phpSha256Hash: 5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e php-7.4-shared-ext: - image: datadog/dd-trace-ci:php-7.4-shared-ext-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.4-shared-ext-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.4/Dockerfile @@ -125,7 +125,7 @@ services: phpSha256Hash: 5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e php-7.3: - image: datadog/dd-trace-ci:php-7.3_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.3_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.3/Dockerfile @@ -137,7 +137,7 @@ services: phpSha256Hash: 9a369c32c6f52036b0a890f290327f148a1904ee66aa56e2c9a7546da6525ec8 php-7.2: - image: datadog/dd-trace-ci:php-7.2_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.2_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.2/Dockerfile @@ -149,7 +149,7 @@ services: phpSha256Hash: 8b2777c741e83f188d3ca6d8e98ece7264acafee86787298fae57e05d0dddc78 php-7.1: - image: datadog/dd-trace-ci:php-7.1_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.1_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.1/Dockerfile @@ -161,7 +161,7 @@ services: phpSha256Hash: 0055f368ffefe51d5a4483755bd17475e88e74302c08b727952831c5b2682ea2 php-7.0: - image: datadog/dd-trace-ci:php-7.0_bookworm-$BOOKWORM_NEXT_VERSION + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.0_bookworm-$BOOKWORM_NEXT_VERSION build: context: . dockerfile: php-7.0/Dockerfile diff --git a/dockerfiles/ci/centos/7/docker-compose.yml b/dockerfiles/ci/centos/7/docker-compose.yml index 2b427a95ba1..c4fc16bd172 100644 --- a/dockerfiles/ci/centos/7/docker-compose.yml +++ b/dockerfiles/ci/centos/7/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: base: - image: 'datadog/dd-trace-ci:centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:centos-7' build: context: . dockerfile: base.Dockerfile @@ -20,7 +20,7 @@ services: phpVersion: "7.0" phpTarGzUrl: https://www.php.net/distributions/php-7.0.33.tar.gz phpSha256Hash: d71a6ecb6b13dc53fed7532a7f8f949c4044806f067502f8fb6f9facbb40452a - image: 'datadog/dd-trace-ci:php-7.0_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.0_centos-7' php-7.1: build: @@ -31,7 +31,7 @@ services: phpVersion: "7.1" phpTarGzUrl: https://www.php.net/distributions/php-7.1.33.tar.gz phpSha256Hash: 0055f368ffefe51d5a4483755bd17475e88e74302c08b727952831c5b2682ea2 - image: 'datadog/dd-trace-ci:php-7.1_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.1_centos-7' php-7.2: build: @@ -42,7 +42,7 @@ services: phpVersion: "7.2" phpTarGzUrl: https://www.php.net/distributions/php-7.2.34.tar.gz phpSha256Hash: 8b2777c741e83f188d3ca6d8e98ece7264acafee86787298fae57e05d0dddc78 - image: 'datadog/dd-trace-ci:php-7.2_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.2_centos-7' php-7.3: build: @@ -53,7 +53,7 @@ services: phpVersion: "7.3" phpTarGzUrl: https://www.php.net/distributions/php-7.3.33.tar.gz phpSha256Hash: 9a369c32c6f52036b0a890f290327f148a1904ee66aa56e2c9a7546da6525ec8 - image: 'datadog/dd-trace-ci:php-7.3_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.3_centos-7' php-7.4: build: @@ -64,7 +64,7 @@ services: phpVersion: "7.4" phpTarGzUrl: https://www.php.net/distributions/php-7.4.33.tar.gz phpSha256Hash: 5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e - image: 'datadog/dd-trace-ci:php-7.4_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.4_centos-7' php-8.0: build: @@ -75,7 +75,7 @@ services: phpVersion: "8.0" phpTarGzUrl: https://www.php.net/distributions/php-8.0.30.tar.gz phpSha256Hash: 449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c - image: 'datadog/dd-trace-ci:php-8.0_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.0_centos-7' php-8.1: build: @@ -86,7 +86,7 @@ services: phpVersion: "8.1" phpTarGzUrl: https://www.php.net/distributions/php-8.1.32.tar.gz phpSha256Hash: "4846836d1de27dbd28e89180f073531087029a77e98e8e019b7b2eddbdb1baff" - image: 'datadog/dd-trace-ci:php-8.1_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.1_centos-7' php-8.2: build: @@ -97,7 +97,7 @@ services: phpVersion: "8.2" phpTarGzUrl: https://www.php.net/distributions/php-8.2.31.tar.gz phpSha256Hash: "083c2f61cc5f527eb293c4c468a91af46a9678785957e023b2796a9db290d870" - image: 'datadog/dd-trace-ci:php-8.2_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.2_centos-7' php-8.3: build: @@ -108,7 +108,7 @@ services: phpVersion: "8.3" phpTarGzUrl: https://www.php.net/distributions/php-8.3.31.tar.gz phpSha256Hash: "4e7baaf0a690e954a20e7ced3dd633ce8cb8094e2b6b612a55e703ecbbdcbf4f" - image: 'datadog/dd-trace-ci:php-8.3_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.3_centos-7' php-8.4: build: @@ -119,7 +119,7 @@ services: phpVersion: "8.4" phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" - image: 'datadog/dd-trace-ci:php-8.4_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.4_centos-7' php-8.5: build: @@ -130,4 +130,4 @@ services: phpVersion: "8.5" phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" - image: 'datadog/dd-trace-ci:php-8.5_centos-7' + image: '${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.5_centos-7' diff --git a/dockerfiles/ci/centos/7/php.Dockerfile b/dockerfiles/ci/centos/7/php.Dockerfile index 281af3e10e8..267435cb40f 100644 --- a/dockerfiles/ci/centos/7/php.Dockerfile +++ b/dockerfiles/ci/centos/7/php.Dockerfile @@ -1,4 +1,5 @@ -FROM datadog/dd-trace-ci:centos-7 AS base +ARG CI_REGISTRY_IMAGE=datadog/dd-trace-ci +FROM ${CI_REGISTRY_IMAGE}:centos-7 AS base ENV PHP_SRC_DIR=/usr/local/src/php ENV PHP_INSTALL_DIR=/opt/php diff --git a/dockerfiles/ci/windows/Dockerfile b/dockerfiles/ci/windows/Dockerfile index d3b7a1c4858..c8e48a59b4d 100644 --- a/dockerfiles/ci/windows/Dockerfile +++ b/dockerfiles/ci/windows/Dockerfile @@ -1,5 +1,6 @@ +ARG CI_REGISTRY_IMAGE=datadog/dd-trace-ci ARG vsVersion -FROM datadog/dd-trace-ci:windows-$vsVersion AS base +FROM ${CI_REGISTRY_IMAGE}:windows-$vsVersion AS base ARG phpTarGzUrl ARG phpVersion diff --git a/dockerfiles/ci/windows/basetools.Dockerfile b/dockerfiles/ci/windows/basetools.Dockerfile index 001f9f553e9..3910c325634 100644 --- a/dockerfiles/ci/windows/basetools.Dockerfile +++ b/dockerfiles/ci/windows/basetools.Dockerfile @@ -1,5 +1,6 @@ +ARG CI_REGISTRY_IMAGE=datadog/dd-trace-ci ARG vsVersion -FROM datadog/dd-trace-ci:windows-base-$vsVersion +FROM ${CI_REGISTRY_IMAGE}:windows-base-$vsVersion RUN powershell.exe "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; $Env:chocolateyVersion = '0.10.15'; $Env:chocolateyUseWindowsCompression = 'false'; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')); ''" diff --git a/dockerfiles/ci/windows/docker-compose.yml b/dockerfiles/ci/windows/docker-compose.yml index 86fde8f34e9..81e4c384f1e 100644 --- a/dockerfiles/ci/windows/docker-compose.yml +++ b/dockerfiles/ci/windows/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: vc15-base: - image: datadog/dd-trace-ci:windows-base-vc15 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-base-vc15 build: platforms: - windows/amd64 @@ -11,7 +11,7 @@ services: dockerfile: vc15.Dockerfile vs16-base: - image: datadog/dd-trace-ci:windows-base-vs16 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-base-vs16 build: platforms: - windows/amd64 @@ -19,7 +19,7 @@ services: dockerfile: vs16.Dockerfile vs17-base: - image: datadog/dd-trace-ci:windows-base-vs17 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-base-vs17 build: platforms: - windows/amd64 @@ -27,7 +27,7 @@ services: dockerfile: vs17.Dockerfile vc15: - image: datadog/dd-trace-ci:windows-vc15 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-vc15 build: platforms: - windows/amd64 @@ -38,7 +38,7 @@ services: sdkVersion: "2.2.0" vs16: - image: datadog/dd-trace-ci:windows-vs16 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-vs16 build: platforms: - windows/amd64 @@ -49,7 +49,7 @@ services: sdkVersion: "2.2.0" vs17: - image: datadog/dd-trace-ci:windows-vs17 + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:windows-vs17 build: platforms: - windows/amd64 @@ -60,7 +60,7 @@ services: sdkVersion: "2.3.0" php-8.5: - image: datadog/dd-trace-ci:php-8.5_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.5_windows build: platforms: - windows/amd64 @@ -72,7 +72,7 @@ services: phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" php-8.4: - image: datadog/dd-trace-ci:php-8.4_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.4_windows build: platforms: - windows/amd64 @@ -84,7 +84,7 @@ services: phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" php-8.3: - image: datadog/dd-trace-ci:php-8.3_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.3_windows build: platforms: - windows/amd64 @@ -96,7 +96,7 @@ services: phpSha256Hash: "4e7baaf0a690e954a20e7ced3dd633ce8cb8094e2b6b612a55e703ecbbdcbf4f" php-8.2: - image: datadog/dd-trace-ci:php-8.2_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.2_windows build: platforms: - windows/amd64 @@ -108,7 +108,7 @@ services: phpSha256Hash: "083c2f61cc5f527eb293c4c468a91af46a9678785957e023b2796a9db290d870" php-8.1: - image: datadog/dd-trace-ci:php-8.1_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.1_windows build: platforms: - windows/amd64 @@ -120,7 +120,7 @@ services: phpSha256Hash: "4846836d1de27dbd28e89180f073531087029a77e98e8e019b7b2eddbdb1baff" php-8.0: - image: datadog/dd-trace-ci:php-8.0_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-8.0_windows build: platforms: - windows/amd64 @@ -132,7 +132,7 @@ services: phpSha256Hash: "449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c" php-7.4: - image: datadog/dd-trace-ci:php-7.4_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.4_windows build: platforms: - windows/amd64 @@ -144,7 +144,7 @@ services: phpSha256Hash: 5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e php-7.3: - image: datadog/dd-trace-ci:php-7.3_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.3_windows build: platforms: - windows/amd64 @@ -156,7 +156,7 @@ services: phpSha256Hash: 9a369c32c6f52036b0a890f290327f148a1904ee66aa56e2c9a7546da6525ec8 php-7.2: - image: datadog/dd-trace-ci:php-7.2_windows + image: ${CI_REGISTRY_IMAGE:-datadog/dd-trace-ci}:php-7.2_windows build: platforms: - windows/amd64 diff --git a/tooling/bin/build-debug-artifact b/tooling/bin/build-debug-artifact index dc8a72cc7ac..97fe09e97a2 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=8 +BOOKWORM_VERSION=9 if [[ "$libc" == "musl" ]]; then DOCKER_IMAGE="datadog/dd-trace-ci:php-compile-extension-alpine-${php_version}" else