mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-24 14:56:13 +01:00

[TASK] Use TYPO3 core-testing images directly (#1293)

Extended core-testing image has been used to
support extended `find` options not provided
by the busybox implementation.

After streamlining used `find` command usages
towards a stripped down version with #1209 it
is now possible to use the TYPO3 core-testing
images directly.

This change modifes `Build/Scripts/runTests.sh`
to use `typo3/core-testing-*` images now.

Resolves: #1275
Related: #1209
This commit is contained in:
Stefan Bürk 2024-05-07 15:24:46 +02:00 committed by GitHub
parent c3bfa4f06f
commit 76293755df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -435,7 +435,7 @@ fi
mkdir -p .cache mkdir -p .cache
mkdir -p .Build/public/typo3temp/var/tests mkdir -p .Build/public/typo3temp/var/tests
IMAGE_PHP="ghcr.io/sbuerk/demo-core-testing-$(echo "php${PHP_VERSION}" | sed -e 's/\.//'):latest" IMAGE_PHP="ghcr.io/typo3/core-testing-$(echo "php${PHP_VERSION}" | sed -e 's/\.//'):latest"
IMAGE_ALPINE="docker.io/alpine:3.8" IMAGE_ALPINE="docker.io/alpine:3.8"
IMAGE_DOCS="ghcr.io/typo3-documentation/render-guides:latest" IMAGE_DOCS="ghcr.io/typo3-documentation/render-guides:latest"
IMAGE_MARIADB="docker.io/mariadb:${DBMS_VERSION}" IMAGE_MARIADB="docker.io/mariadb:${DBMS_VERSION}"
@ -601,12 +601,12 @@ case ${TEST_SUITE} in
;; ;;
update) update)
# pull typo3/core-testing-*:latest versions of those ones that exist locally # pull typo3/core-testing-*:latest versions of those ones that exist locally
echo "> pull ghcr.io/sbuerk/demo-core-testing-*:latest versions of those ones that exist locally" echo "> pull ghcr.io/typo3/core-testing-*:latest versions of those ones that exist locally"
${CONTAINER_BIN} images ghcr.io/sbuerk/demo-core-testing-*:latest --format "{{.Repository}}:latest" | xargs -I {} ${CONTAINER_BIN} pull {} ${CONTAINER_BIN} images ghcr.io/typo3/core-testing-*:latest --format "{{.Repository}}:latest" | xargs -I {} ${CONTAINER_BIN} pull {}
echo "" echo ""
# remove "dangling" typo3/core-testing-* images (those tagged as <none>) # remove "dangling" typo3/core-testing-* images (those tagged as <none>)
echo "> remove \"dangling\" ghcr.io/sbuerk/demo-core-testing-* images (those tagged as <none>)" echo "> remove \"dangling\" ghcr.io/typo3/core-testing-* images (those tagged as <none>)"
${CONTAINER_BIN} images --filter "reference=ghcr.io/sbuerk/demo-core-testing-*" --filter "dangling=true" --format "{{.ID}}" | xargs -I {} ${CONTAINER_BIN} rmi {} ${CONTAINER_BIN} images --filter "reference=ghcr.io/typo3/core-testing-*" --filter "dangling=true" --format "{{.ID}}" | xargs -I {} ${CONTAINER_BIN} rmi {}
echo "" echo ""
;; ;;
*) *)