Fix support for compose v2 in drupal test-unit command

inviqa · Apr 3, 2023 · aafc3e6 · aafc3e6
1 parent 734654f
commit aafc3e6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/drupal/harness.yml b/src/drupal/harness.yml
@@ -97,8 +97,13 @@ command('test-unit'):
     $COMPOSE_BIN exec -T -u root php-fpm bash -c 'mkdir -p /app/docroot/sites/simpletest'
     $COMPOSE_BIN exec -T -u root php-fpm bash -c 'chown -R www-data:www-data /app/docroot/sites/simpletest'
     if ! $COMPOSE_BIN exec -T -u root php-fpm bash -c '[ -f /app/bin/phpunit ]'; then
-      run "docker cp ${COMPOSE_PROJECT_NAME}_console_1:/app/bin - | docker cp - ${COMPOSE_PROJECT_NAME}_php-fpm_1:/app/"
-      run "docker cp ${COMPOSE_PROJECT_NAME}_console_1:/app/vendor - | docker cp - ${COMPOSE_PROJECT_NAME}_php-fpm_1:/app/"
+      if [[ "$($COMPOSE_BIN version --short)" =~ ^1\. ]]; then
+        run "docker cp ${COMPOSE_PROJECT_NAME}_console_1:/app/bin - | docker cp - ${COMPOSE_PROJECT_NAME}_php-fpm_1:/app/"
+        run "docker cp ${COMPOSE_PROJECT_NAME}_console_1:/app/vendor - | docker cp - ${COMPOSE_PROJECT_NAME}_php-fpm_1:/app/"
+      else
+        run "$COMPOSE_BIN cp console:/app/bin - | $COMPOSE_BIN cp - php-fpm:/app/"
+        run "$COMPOSE_BIN cp console:/app/vendor - | $COMPOSE_BIN cp - php-fpm:/app/"
+      fi
     fi
     passthru $COMPOSE_BIN exec -T -u www-data php-fpm bash -c 'bin/phpunit'
 ---