Commit 7970143b authored by Jochen Roth's avatar Jochen Roth Committed by Christian Kuhn
Browse files

[TASK] Make runTests.sh compatible with docker-compose v2

docker-compose.yml is now working with v2.0.0beta.
Restored old behavior to retrieve the actual CORE_ROOT
path using "realpath" which also works on MacOS.

Resolves: #94612
Releases: master, 10.4, 9.5
Change-Id: I62ab40870e285b3533a259105dac241e3c4a6af2
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70023

Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent b9f25d92
......@@ -272,7 +272,7 @@ cd "$THIS_SCRIPT_DIR" || exit 1
cd ../testing-docker/local || exit 1
# Option defaults
CORE_ROOT="${PWD}/../../../"
CORE_ROOT=`realpath ${PWD}/../../../`
TEST_SUITE="unit"
DBMS="mariadb"
PHP_VERSION="7.4"
......
......@@ -22,7 +22,7 @@ services:
mssql2019latest:
image: typo3/core-testing-mssql2019:latest
environment:
ACCEPT_EULA: Y
ACCEPT_EULA: "Y"
SA_PASSWORD: "Test1234!"
MSSQL_PID: Developer
......@@ -36,7 +36,7 @@ services:
web:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
stop_grace_period: 1s
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -62,7 +62,7 @@ services:
acceptance_split:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
working_dir: ${CORE_ROOT}
......@@ -87,7 +87,7 @@ services:
"
acceptance_backend_mariadb:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
environment:
typo3DatabaseName: func_test
typo3DatabaseUsername: root
......@@ -143,7 +143,7 @@ services:
"
acceptance_backend_mysql:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
environment:
typo3DatabaseName: func_test
typo3DatabaseUsername: root
......@@ -199,7 +199,7 @@ services:
"
acceptance_backend_postgres:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -258,7 +258,7 @@ services:
"
acceptance_install_mysql:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
environment:
typo3InstallMysqlDatabaseHost: mysql
typo3InstallMysqlDatabaseName: func_test
......@@ -307,7 +307,7 @@ services:
"
acceptance_install_mariadb:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
environment:
typo3InstallMysqlDatabaseHost: mariadb
typo3InstallMysqlDatabaseName: func_test
......@@ -356,7 +356,7 @@ services:
"
acceptance_install_postgres:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
environment:
typo3InstallPostgresqlDatabaseHost: postgres
typo3InstallPostgresqlDatabaseName: ${HOST_USER}
......@@ -397,7 +397,7 @@ services:
"
acceptance_install_sqlite:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -424,7 +424,7 @@ services:
build_css:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -442,7 +442,7 @@ services:
build_javascript:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -460,7 +460,7 @@ services:
cgl_git:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -477,7 +477,7 @@ services:
cgl_all:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -495,7 +495,7 @@ services:
check_annotations:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -512,7 +512,7 @@ services:
check_bom:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -529,7 +529,7 @@ services:
check_composer:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -546,7 +546,7 @@ services:
check_csv_fixtures:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -563,7 +563,7 @@ services:
fix_csv_fixtures:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -580,7 +580,7 @@ services:
check_exception_codes:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -597,7 +597,7 @@ services:
check_extension_scanner_rst:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -614,7 +614,7 @@ services:
check_file_path_length:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -631,7 +631,7 @@ services:
check_git_submodule:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -651,7 +651,7 @@ services:
check_grunt_clean:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -673,7 +673,7 @@ services:
check_permissions:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -690,7 +690,7 @@ services:
check_rst:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -707,7 +707,7 @@ services:
composer_install:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -724,7 +724,7 @@ services:
composer_install_max:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -743,7 +743,7 @@ services:
composer_install_min:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -762,7 +762,7 @@ services:
composer_validate:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -779,7 +779,7 @@ services:
doc_block_check:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
working_dir: ${CORE_ROOT}
......@@ -793,7 +793,7 @@ services:
functional_split:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
working_dir: ${CORE_ROOT}
......@@ -818,7 +818,7 @@ services:
"
functional_mariadb:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -875,7 +875,7 @@ services:
"
functional_mysql:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -933,7 +933,7 @@ services:
functional_mssql2019latest:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -992,7 +992,7 @@ services:
"
functional_postgres:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1041,7 +1041,7 @@ services:
"
functional_sqlite:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1077,7 +1077,7 @@ services:
lint_php:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${PASSWD_PATH}:/etc/passwd:ro
......@@ -1094,7 +1094,7 @@ services:
lint_scss:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1112,7 +1112,7 @@ services:
lint_html:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1130,7 +1130,7 @@ services:
lint_typescript:
image: typo3/core-testing-js:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1148,7 +1148,7 @@ services:
list_exception_codes:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1165,7 +1165,7 @@ services:
phpstan:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
working_dir: ${CORE_ROOT}
......@@ -1180,7 +1180,7 @@ services:
unit:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1207,7 +1207,7 @@ services:
unitDeprecated:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1234,7 +1234,7 @@ services:
unitJavascript:
image: typo3/core-testing-js-chrome:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......@@ -1253,7 +1253,7 @@ services:
unitRandom:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
user: "${HOST_UID}"
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment