diff options
Diffstat (limited to 'build/integration/run-docker.sh')
| -rwxr-xr-x | build/integration/run-docker.sh | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/build/integration/run-docker.sh b/build/integration/run-docker.sh index 7f8408d2126..e1ec797fcf0 100755 --- a/build/integration/run-docker.sh +++ b/build/integration/run-docker.sh @@ -1,22 +1,7 @@ #!/usr/bin/env bash -# @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com) -# @copyright Copyright (c) 2018, Daniel Calviño Sánchez (danxuliu@gmail.com) -# -# @license GNU AGPL version 3 or any later version -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later # Helper script to run the integration tests on a fresh Nextcloud server through # Docker. @@ -140,7 +125,9 @@ function prepareDocker() { echo "Starting the Nextcloud container" # When using "nextcloudci/phpX.Y" images the container exits immediately if # no command is given, so a Bash session is created to prevent that. - docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER $NEXTCLOUD_LOCAL_CONTAINER_NETWORK_OPTIONS --interactive --tty $NEXTCLOUD_LOCAL_IMAGE bash + docker run \ + --volume composer_cache:/root/.composer \ + --detach --name=$NEXTCLOUD_LOCAL_CONTAINER $NEXTCLOUD_LOCAL_CONTAINER_NETWORK_OPTIONS --interactive --tty $NEXTCLOUD_LOCAL_IMAGE bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" @@ -152,6 +139,7 @@ function prepareDocker() { tar --create --file="$NEXTCLOUD_LOCAL_TAR" \ --exclude=".git" \ --exclude="./config/config.php" \ + --exclude="./config/*.config.php" \ --exclude="./data" \ --exclude="./data-autotest" \ --exclude="./tests" \ @@ -211,8 +199,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-php8.2:latest" if [ "$1" = "--image" ]; then NEXTCLOUD_LOCAL_IMAGE=$2 @@ -238,9 +227,9 @@ fi # "--database-image XXX" option can be provided to set the Docker image to use # for the database container (ignored when using "sqlite"). if [ "$DATABASE" = "mysql" ]; then - DATABASE_IMAGE="mysql:5.7" + DATABASE_IMAGE="mysql:8.4" elif [ "$DATABASE" = "pgsql" ]; then - DATABASE_IMAGE="postgres:10" + DATABASE_IMAGE="postgres:15" fi if [ "$1" = "--database-image" ]; then DATABASE_IMAGE=$2 |