diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-03-04 09:23:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 09:23:17 +0100 |
| commit | a78f473252b2743c46917194135ada7de2249f8a (patch) | |
| tree | 65840f43780aab01e34b2b84d32b6edc52aa65c2 | |
| parent | 8b1857fc727557012184ac4710c9b87c842a466e (diff) | |
| parent | a3f3ffe6a65ddeaf5a5204a0ba8b0717627e42db (diff) | |
| download | nextcloud-server-a78f473252b2743c46917194135ada7de2249f8a.tar.gz nextcloud-server-a78f473252b2743c46917194135ada7de2249f8a.zip | |
Merge pull request #31435 from nextcloud/update-images-in-scripts-to-run-local-tests-in-Docker
| -rwxr-xr-x | build/integration/run-docker.sh | 5 | ||||
| -rwxr-xr-x | tests/acceptance/run.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build/integration/run-docker.sh b/build/integration/run-docker.sh index 308749fd810..7dd270b0202 100755 --- a/build/integration/run-docker.sh +++ b/build/integration/run-docker.sh @@ -213,8 +213,9 @@ trap cleanUp EXIT cd "$(dirname $0)" # "--image XXX" option can be provided to set the Docker image to use to run -# the integration tests (one of the "nextcloudci/phpX.Y:phpX.Y-Z" images). -NEXTCLOUD_LOCAL_IMAGE="nextcloudci/php7.3:php7.3-5" +# the integration tests (one of the "nextcloudci/phpX.Y:phpX.Y-Z" or +# "ghcr.io/nextcloud/continuous-integration-integration-phpX.Y:latest" images). +NEXTCLOUD_LOCAL_IMAGE="ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest" if [ "$1" = "--image" ]; then NEXTCLOUD_LOCAL_IMAGE=$2 diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 07f3f3cce51..a4c0a594756 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -144,7 +144,7 @@ function prepareDocker() { --network=container:$SELENIUM_CONTAINER \ --volume composer_cache:/root/.composer \ --interactive \ - --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash + --tty ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" |