Commit a6ecc6c4 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] runTests.sh: Switch to a new set of test images

New images are to be found on official TYPO3
https://hub.docker.com/u/typo3 account.

Most images are based on alpine instead of ubuntu and
are thus significantly smaller than the old ones. For
example, the php 7.4 image is now ~170MB instead of ~500MB.

Image definitions are found and maintained at
https://gitlab.typo3.org/core-testing/testing-infrastructure/

* typo3/core-testing-phpXY: Images based on the official
  PHP alpine builds, extended with commands and modules
  we need.

* typo3/core-testing-js: Image based on official node
  image, with current yarn.

* typo3/core-testing-js-chrome: As above, but with chrome
  for javascript unit testing.

* typo3/core-testing-mssql2019: Image for microsoft sql
  server that includes a brutal hack to force sql server
  is fine if databases are located on a tmpfs (CI does that).

* postgres/XY-alpine: Drop-in replacement using the -alpine
  version that is ~1/3 in size.

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

Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 21821f8d
......@@ -174,10 +174,10 @@ Options:
Activate dry-run in CGL check that does not actively change files and only prints broken ones.
-u
Update existing typo3gmbh/phpXY:latest docker images. Maintenance call to docker pull latest
Update existing typo3/core-testing-*:latest docker images. Maintenance call to docker pull latest
versions of the main php images. The images are updated once in a while and only the youngest
ones are supported by core testing. Use this if weird test errors occur. Also removes obsolete
image versions of typo3gmbh/phpXY.
image versions of typo3/core-testing-*.
-v
Enable verbose script output. Shows variables and docker commands.
......@@ -617,10 +617,10 @@ case ${TEST_SUITE} in
docker-compose down
;;
update)
# pull typo3gmbh/phpXY:latest versions of those ones that exist locally
docker images typo3gmbh/php*:latest --format "{{.Repository}}:latest" | xargs -I {} docker pull {}
# remove "dangling" typo3gmbh/phpXY images (those tagged as <none>)
docker images typo3gmbh/php* --filter "dangling=true" --format "{{.ID}}" | xargs -I {} docker rmi {}
# pull typo3/core-testing-*:latest versions of those ones that exist locally
docker images typo3/core-testing-*:latest --format "{{.Repository}}:latest" | xargs -I {} docker pull {}
# remove "dangling" typo3/core-testing-* images (those tagged as <none>)
docker images typo3/core-testing-* --filter "dangling=true" --format "{{.ID}}" | xargs -I {} docker rmi {}
;;
*)
echo "Invalid -s option argument ${TEST_SUITE}" >&2
......
......@@ -18,14 +18,14 @@ services:
- /var/lib/mysql/:rw,noexec,nosuid
mssql2019latest:
image: mcr.microsoft.com/mssql/server:2019-latest
image: typo3/core-testing-mssql2019:latest
environment:
ACCEPT_EULA: Y
SA_PASSWORD: "Test1234!"
MSSQL_PID: Developer
postgres:
image: postgres:${POSTGRES_VERSION}
image: postgres:${POSTGRES_VERSION}-alpine
environment:
POSTGRES_PASSWORD: funcp
POSTGRES_USER: funcu
......@@ -33,7 +33,7 @@ services:
- /var/lib/postgresql/data:rw,noexec,nosuid
web:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
stop_grace_period: 1s
volumes:
......@@ -47,7 +47,7 @@ services:
image: memcached:1.5-alpine
acceptance_split:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -72,7 +72,7 @@ services:
echo Database is up;
"
acceptance_backend_mariadb:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
environment:
typo3DatabaseName: func_test
......@@ -119,7 +119,7 @@ services:
echo Database is up;
"
acceptance_install_mysql:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
environment:
typo3InstallMysqlDatabaseHost: mysql
......@@ -159,7 +159,7 @@ services:
echo Database is up;
"
acceptance_install_mariadb:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
environment:
typo3InstallMysqlDatabaseHost: mariadb
......@@ -199,7 +199,7 @@ services:
echo Database is up;
"
acceptance_install_postgres:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
environment:
typo3InstallPostgresqlDatabaseHost: postgres
......@@ -231,7 +231,7 @@ services:
sleep 1;
"
acceptance_install_sqlite:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -249,7 +249,7 @@ services:
"
build_css:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -267,7 +267,7 @@ services:
"
build_javascript:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -285,7 +285,7 @@ services:
"
cgl_git:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -302,7 +302,7 @@ services:
"
cgl_all:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -320,7 +320,7 @@ services:
"
check_annotations:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -337,7 +337,7 @@ services:
"
check_bom:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -354,7 +354,7 @@ services:
"
check_composer:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -371,7 +371,7 @@ services:
"
check_csv_fixtures:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -388,7 +388,7 @@ services:
"
fix_csv_fixtures:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -405,7 +405,7 @@ services:
"
check_exception_codes:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -422,7 +422,7 @@ services:
"
check_extension_scanner_rst:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -439,7 +439,7 @@ services:
"
check_file_path_length:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -456,7 +456,7 @@ services:
"
check_git_submodule:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -476,7 +476,7 @@ services:
"
check_grunt_clean:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -498,7 +498,7 @@ services:
"
check_permissions:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -515,7 +515,7 @@ services:
"
check_rst:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -532,7 +532,7 @@ services:
"
check_xlf:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -549,7 +549,7 @@ services:
"
composer_install:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -566,7 +566,7 @@ services:
"
composer_install_max:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -585,7 +585,7 @@ services:
"
composer_install_min:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -604,7 +604,7 @@ services:
"
composer_validate:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -621,7 +621,7 @@ services:
"
functional_split:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -646,7 +646,7 @@ services:
echo Database is up;
"
functional_mariadb:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -700,7 +700,7 @@ services:
echo Database is up;
"
functional_mysql:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -755,7 +755,7 @@ services:
"
functional_mssql2019latest:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -811,7 +811,7 @@ services:
echo Database is up;
"
functional_postgres:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -857,7 +857,7 @@ services:
sleep 1;
"
functional_sqlite:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -890,7 +890,7 @@ services:
"
lint:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -907,7 +907,7 @@ services:
"
lint_scss:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -925,7 +925,7 @@ services:
"
lint_typescript:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -943,7 +943,7 @@ services:
"
unit:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -968,7 +968,7 @@ services:
"
unitDeprecated:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -993,7 +993,7 @@ services:
"
unitJavascript:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-js-chrome:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......@@ -1012,7 +1012,7 @@ services:
"
unitRandom:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
......
Supports Markdown
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