danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-22 13:36:13 +01:00
Code Activity

[BUGFIX] Use extended sbuerk/demo-core-testing-* images (#1081)

Browse source 
The TYPO3 core testing images only adds stuffs which is
required for the core testing itself and which can be
considered as generic project and extension testing
requirement.

This extension uses advanced `find` options which are
not part of the base busybox provided tools used by
the alpine base image, for example for the `lintYaml`
command in `Build/Scripts/runTests.sh`.

The used `-regextype` option of the `find` binary does
not exists in the stripped down busybox implementation
used by the alpine base images. The `findutils` package
is required to provide the gnu `find` command supporting
this and other advanced options, which can be found as
a solution here:

https://github.com/nextcloud/docker/issues/282

Due to the fact that the additional package will not
make the way into the TYPO3 core images like other
requirements some project or extension may have, a
demonstration github repository has been created some
time ago to demonstrate automatic extended image builds
based on the core testing images. These images already
contains stuff which is required by some projects and
extensions - and the gnu `findutils` package has been
added to these images now with the feature commit

9f8b125b6a

This change switches the used php images from the
`typo3/core-testing-phpXY` images to the extended
`sbuerk/demo-core-testing-phpXY` images.

Can be tested and verified by using

```shell
./Build/Scripts/runTests.sh -s lintYaml
```

with and without this change.

Resolves: #966
This commit is contained in:
Stefan Bürk 2023-12-19 09:46:50 +01:00 committed by GitHub
parent 92608fdd98
commit f93010c332
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Build/Scripts/runTests.sh
View file

@ -432,7 +432,7 @@ fi
mkdir -p .cache mkdir -p .cache
mkdir -p .Build/Web/typo3temp/var/tests mkdir -p .Build/Web/typo3temp/var/tests
IMAGE_PHP="ghcr.io/typo3/core-testing-$(echo "php${PHP_VERSION}" | sed -e 's/\.//'):latest" IMAGE_PHP="ghcr.io/sbuerk/demo-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/t3docs/render-documentation:latest" IMAGE_DOCS="ghcr.io/t3docs/render-documentation:latest"
IMAGE_MARIADB="docker.io/mariadb:${DBMS_VERSION}" IMAGE_MARIADB="docker.io/mariadb:${DBMS_VERSION}"
@ -612,12 +612,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/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"
${CONTAINER_BIN} images ghcr.io/typo3/core-testing-*:latest --format "{{.Repository}}:latest" | xargs -I {} ${CONTAINER_BIN} pull {} ${CONTAINER_BIN} images ghcr.io/sbuerk/demo-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/typo3/core-testing-* images (those tagged as <none>)" echo "> remove \"dangling\" ghcr.io/sbuerk/demo-core-testing-* images (those tagged as <none>)"
${CONTAINER_BIN} images ghcr.io/typo3/core-testing-* --filter "dangling=true" --format "{{.ID}}" | xargs -I {} ${CONTAINER_BIN} rmi {} ${CONTAINER_BIN} images ghcr.io/sbuerk/demo-core-testing-* --filter "dangling=true" --format "{{.ID}}" | xargs -I {} ${CONTAINER_BIN} rmi {}
echo "" echo ""
;; ;;
*) *)