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>
This commit is contained in:
parent
95dc2ad13c
commit
34f397fd22
|
@ -189,6 +189,10 @@ composer install
|
||||||
|
|
||||||
cd ../../
|
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=""
|
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS=""
|
||||||
if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
|
if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
|
||||||
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"
|
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"
|
||||||
|
|
|
@ -153,10 +153,6 @@ function prepareDocker() {
|
||||||
docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud
|
docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud
|
||||||
docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR"
|
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
|
# 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
|
# 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
|
# copied to the container to avoid copying the large and unneeded history of
|
||||||
|
|
Loading…
Reference in New Issue