From a3f3ffe6a65ddeaf5a5204a0ba8b0717627e42db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 3 Mar 2022 19:53:26 +0100 Subject: [PATCH] Update images in scripts to run local tests in Docker MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PHP 7.3 support was dropped for Nextcloud 24. The Docker images are updated to the same images used for integration and acceptance tests in CI. Signed-off-by: Daniel Calviño Sánchez --- build/integration/run-docker.sh | 5 +++-- 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)" -- 2.39.5