Link the default Apache directory to the Nextcloud server in all runners

In order to run the acceptance tests in Apache "/var/www/html" has to be
linked to the root directory of the Nextcloud server. Before this was
automatically done when launching the acceptance tests through
"./run.sh", but an explicit command was needed when run in Drone. Now
the linking was moved from "run.sh" to "run-local.sh", so it is
automatically done when run through "./run.sh" and in Drone, including
when running the tests for an app instead of for the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh
index 7ae6705000c664c7b5a9f05803aae7876d8d7b03..548e9e9ceae69c87de6b21d5a61f61b7ac727af6 100755 (executable)
--- a/tests/acceptance/run-local.sh
+++ b/tests/acceptance/run-local.sh
@@ -189,6 +189,10 @@ composer install
 
 cd ../../
 
+# Link the default Apache directory to the root directory of the Nextcloud
+# server to make possible to run the Nextcloud server on Apache if needed.
+ln --symbolic $(pwd) /var/www/html
+
 INSTALL_AND_CONFIGURE_SERVER_PARAMETERS=""
 if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
        INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"

diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
index 3ed1207e3799e317a566fae1bcc16fd9b1cbd3d2..366e7a67bf5212837ab4cbaf034d10a3df16fc37 100755 (executable)
--- a/tests/acceptance/run.sh
+++ b/tests/acceptance/run.sh
@@ -153,10 +153,6 @@ function prepareDocker() {
        docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud
        docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR"
 
-       # Link the default Apache directory to the root directory of the Nextcloud
-       # server to make possible to run the Nextcloud server on Apache if needed.
-       docker exec $NEXTCLOUD_LOCAL_CONTAINER ln --symbolic /nextcloud /var/www/html
-
        # run-local.sh expects a Git repository to be available in the root of the
        # Nextcloud server, but it was excluded when the Git working directory was
        # copied to the container to avoid copying the large and unneeded history of