upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #31435 from nextcloud/update-images-in-scripts-to-run-local-tests-in-Docker

Browse source
This commit is contained in:
John Molakvoæ 2022-03-04 09:23:17 +01:00 committed by GitHub
commit a78f473252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/integration/run-docker.sh
View file

@ -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

2
tests/acceptance/run.sh
View file

@ -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)"