Browse Source

Add cache for local integration test container

Signed-off-by: Louis Chemineau <louis@chmn.me>
tags/v23.0.0beta1
Louis Chemineau 2 years ago
parent
commit
b13ce08ac8
2 changed files with 10 additions and 2 deletions
  1. 3
    1
      build/integration/run-docker.sh
  2. 7
    1
      tests/acceptance/run.sh

+ 3
- 1
build/integration/run-docker.sh View File

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

+ 7
- 1
tests/acceptance/run.sh View File

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

Loading…
Cancel
Save