Fix flow testsuite

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

docker-compose.linux.override.yml

@@ -15,7 +15,7 @@ x-aliases:
 services:
   # --- Alpine ---
   '8.0-alpine': { <<: *linux_php_service }
-  # --- Buster ---
+  # --- Bookworm ---
   '7.0-bookworm': { <<: *linux_php_service }
   '7.1-bookworm': { <<: *linux_php_service }
   '7.2-bookworm': { <<: *linux_php_service }

dockerfiles/ci/buster/php-8.0/Dockerfile

@@ -84,7 +84,7 @@ RUN set -eux; \
     switch-php debug;
 
 # Install Composer
-COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
 COPY welcome /etc/motd
 RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

dockerfiles/ci/buster/php-8.1/Dockerfile

@@ -85,7 +85,7 @@ RUN set -eux; \
     switch-php debug;
 
 # Install Composer
-COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
 COPY welcome /etc/motd
 RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd

dockerfiles/frameworks/flow.yml

@@ -4,6 +4,8 @@ services:
   flow:
     depends_on: ['mysql', 'nginx_file_server']
     image: 'datadog/dd-trace-ci:php-framework-flow'
+    environment:
+      DD_LOGS_INJECTION: "false"
     build:
       context: contrib
       target: flow
@@ -17,7 +19,6 @@ services:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
       MYSQL_ROOT_HOST: "%"
-      DD_LOGS_INJECTION: "false"
     expose: ["3306"]
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]