diff --git a/mirror_images.yaml b/mirror_images.yaml index 2722363daaa..c553f04e993 100644 --- a/mirror_images.yaml +++ b/mirror_images.yaml @@ -58,16 +58,16 @@ - "datadog/system-tests:nodejs-lambda-runtime.base-93b9660a8ce9" - "datadog/system-tests:nodejs_buddy-v1" - "datadog/system-tests:openai-py.base-31091e40843e" -- "datadog/system-tests:php-fpm-7.0.base-d4abf95b5951" -- "datadog/system-tests:php-fpm-7.1.base-31da726f689d" -- "datadog/system-tests:php-fpm-7.2.base-ae3edd34deaf" -- "datadog/system-tests:php-fpm-7.3.base-b19f379dbed1" -- "datadog/system-tests:php-fpm-7.4.base-7062ac7ded14" -- "datadog/system-tests:php-fpm-8.0.base-fd02fa8e05d3" -- "datadog/system-tests:php-fpm-8.1.base-b357426cbfae" -- "datadog/system-tests:php-fpm-8.2.base-5d20a5371749" -- "datadog/system-tests:php-fpm-8.5.base-9bf1cea74f8d" -- "datadog/system-tests:php-fpm-8.6.base-a2c4a828bef4" +- "datadog/system-tests:php-fpm-7.0.base-345901124135" +- "datadog/system-tests:php-fpm-7.1.base-05e468297d96" +- "datadog/system-tests:php-fpm-7.2.base-d549e63349af" +- "datadog/system-tests:php-fpm-7.3.base-d5e02f1eba6e" +- "datadog/system-tests:php-fpm-7.4.base-2b2481f96d77" +- "datadog/system-tests:php-fpm-8.0.base-2f4217d11140" +- "datadog/system-tests:php-fpm-8.1.base-1f0de527f6d9" +- "datadog/system-tests:php-fpm-8.2.base-918d9b6ebc0b" +- "datadog/system-tests:php-fpm-8.5.base-28f425494b57" +- "datadog/system-tests:php-fpm-8.6.base-fc6af7d37b2d" - "datadog/system-tests:php-parametric.base-c84d9fa316f4" - "datadog/system-tests:play.base-6ab8cfc2eec4" - "datadog/system-tests:proxy-v1" diff --git a/utils/build/docker/base-images.lock.json b/utils/build/docker/base-images.lock.json index 2b7c5c98755..983d15d62f9 100644 --- a/utils/build/docker/base-images.lock.json +++ b/utils/build/docker/base-images.lock.json @@ -47,16 +47,16 @@ "system_tests_base_php_apache_mod_8_2": "datadog/system-tests:apache-mod-8.2.base-758f7958789c", "system_tests_base_php_apache_mod_8_2_zts": "datadog/system-tests:apache-mod-8.2-zts.base-10a61c3c8684", "system_tests_base_php_laravel11x": "datadog/system-tests:laravel11x.base-f1225ab2c1fb", - "system_tests_base_php_php_fpm_7_0": "datadog/system-tests:php-fpm-7.0.base-d4abf95b5951", - "system_tests_base_php_php_fpm_7_1": "datadog/system-tests:php-fpm-7.1.base-31da726f689d", - "system_tests_base_php_php_fpm_7_2": "datadog/system-tests:php-fpm-7.2.base-ae3edd34deaf", - "system_tests_base_php_php_fpm_7_3": "datadog/system-tests:php-fpm-7.3.base-b19f379dbed1", - "system_tests_base_php_php_fpm_7_4": "datadog/system-tests:php-fpm-7.4.base-7062ac7ded14", - "system_tests_base_php_php_fpm_8_0": "datadog/system-tests:php-fpm-8.0.base-fd02fa8e05d3", - "system_tests_base_php_php_fpm_8_1": "datadog/system-tests:php-fpm-8.1.base-b357426cbfae", - "system_tests_base_php_php_fpm_8_2": "datadog/system-tests:php-fpm-8.2.base-5d20a5371749", - "system_tests_base_php_php_fpm_8_5": "datadog/system-tests:php-fpm-8.5.base-9bf1cea74f8d", - "system_tests_base_php_php_fpm_8_6": "datadog/system-tests:php-fpm-8.6.base-a2c4a828bef4", + "system_tests_base_php_php_fpm_7_0": "datadog/system-tests:php-fpm-7.0.base-345901124135", + "system_tests_base_php_php_fpm_7_1": "datadog/system-tests:php-fpm-7.1.base-05e468297d96", + "system_tests_base_php_php_fpm_7_2": "datadog/system-tests:php-fpm-7.2.base-d549e63349af", + "system_tests_base_php_php_fpm_7_3": "datadog/system-tests:php-fpm-7.3.base-d5e02f1eba6e", + "system_tests_base_php_php_fpm_7_4": "datadog/system-tests:php-fpm-7.4.base-2b2481f96d77", + "system_tests_base_php_php_fpm_8_0": "datadog/system-tests:php-fpm-8.0.base-2f4217d11140", + "system_tests_base_php_php_fpm_8_1": "datadog/system-tests:php-fpm-8.1.base-1f0de527f6d9", + "system_tests_base_php_php_fpm_8_2": "datadog/system-tests:php-fpm-8.2.base-918d9b6ebc0b", + "system_tests_base_php_php_fpm_8_5": "datadog/system-tests:php-fpm-8.5.base-28f425494b57", + "system_tests_base_php_php_fpm_8_6": "datadog/system-tests:php-fpm-8.6.base-fc6af7d37b2d", "system_tests_base_php_php_parametric": "datadog/system-tests:php-parametric.base-c84d9fa316f4", "system_tests_base_php_symfony7x": "datadog/system-tests:symfony7x.base-d7edc99f1278", "system_tests_base_python_aiohttp": "datadog/system-tests:aiohttp.base-8697afadfeae", diff --git a/utils/build/docker/php/docker-bake.hcl b/utils/build/docker/php/docker-bake.hcl index cb39dea1e8d..68b4a57bff0 100644 --- a/utils/build/docker/php/docker-bake.hcl +++ b/utils/build/docker/php/docker-bake.hcl @@ -220,7 +220,7 @@ target "php-fpm-8_5" { target "php-fpm-8_6" { inherits = ["_common"] dockerfile = "php-fpm.base.Dockerfile" - args = { PHP_VERSION = "8.6" } + args = { PHP_VERSION = "8.6", PHP_MIN_PACKAGE_VERSION = "8.6.0" } tags = ["datadog/system-tests:php-fpm-8.6.base"] } diff --git a/utils/build/docker/php/php-fpm.base.Dockerfile b/utils/build/docker/php/php-fpm.base.Dockerfile index 30d6a20d043..944417c3583 100644 --- a/utils/build/docker/php/php-fpm.base.Dockerfile +++ b/utils/build/docker/php/php-fpm.base.Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:24.04 ARG PHP_VERSION +ARG PHP_MIN_PACKAGE_VERSION ENV PHP_VERSION=${PHP_VERSION} # build.sh only reads from these directories (see php-fpm/build.sh, it installs the plain weblog); keep this @@ -11,7 +12,7 @@ COPY php-fpm /tmp/php/php-fpm COPY common /tmp/php/common RUN chmod +x /tmp/php/php-fpm/build.sh -RUN /tmp/php/php-fpm/build.sh $PHP_VERSION +RUN /tmp/php/php-fpm/build.sh $PHP_VERSION $PHP_MIN_PACKAGE_VERSION RUN rm -rf /tmp/php/ ENV DD_TRACE_ENABLED=1 diff --git a/utils/build/docker/php/php-fpm/build.sh b/utils/build/docker/php/php-fpm/build.sh index fe2c51a758c..f488da34d9e 100644 --- a/utils/build/docker/php/php-fpm/build.sh +++ b/utils/build/docker/php/php-fpm/build.sh @@ -3,6 +3,7 @@ set -e PHP_VERSION=$1 +PHP_MIN_PACKAGE_VERSION=$2 PHP_MAJOR_VERSION=`echo $PHP_VERSION | cut -d. -f1` # Override apt sources to avoid backpports, restricted and multiverse (speed up update runs). @@ -41,6 +42,13 @@ fi nala install -y --no-install-recommends tzdata publicsuffix curl apache2 libapache2-mod-fcgid jq ca-certificates git unzip php$PHP_VERSION-fpm php$PHP_VERSION-curl apache2 php$PHP_VERSION-mysql php$PHP_VERSION-pgsql php$PHP_VERSION-xml $MONGODB_PKG php$PHP_VERSION-mbstring $RDKAFKA_PKG +# Fail if the PPA served an older PHP build than the target's floor (see docker-bake.hcl). +PHP_PACKAGE_VERSION=$(dpkg-query -W -f='${Version}' "php$PHP_VERSION-fpm") +if [ -n "$PHP_MIN_PACKAGE_VERSION" ] && ! dpkg --compare-versions "$PHP_PACKAGE_VERSION" ge "$PHP_MIN_PACKAGE_VERSION"; then + echo "php$PHP_VERSION-fpm $PHP_PACKAGE_VERSION is older than $PHP_MIN_PACKAGE_VERSION" + exit 1 +fi + rm -rf /usr/sbin/policy-rc.d rm -rf /var/lib/apt/lists/*