From b13ce08ac8392b76ceaf736bb3f3d393e8f71b6c Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 4 Oct 2021 16:06:13 +0200 Subject: Add cache for local integration test container Signed-off-by: Louis Chemineau --- build/integration/run-docker.sh | 4 +++- tests/acceptance/run.sh | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build/integration/run-docker.sh b/build/integration/run-docker.sh index 7f8408d2126..308749fd810 100755 --- a/build/integration/run-docker.sh +++ b/build/integration/run-docker.sh @@ -140,7 +140,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)" diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 9a77d717a0c..07f3f3cce51 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -138,7 +138,13 @@ function prepareDocker() { # Selenium server. # 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 --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash + docker run \ + --detach \ + --name=$NEXTCLOUD_LOCAL_CONTAINER \ + --network=container:$SELENIUM_CONTAINER \ + --volume composer_cache:/root/.composer \ + --interactive \ + --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" -- cgit v1.2.3