diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-04-18 21:24:46 +0300 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-04-21 15:24:37 +0300 |
| commit | 72310cdac1d9a4b9dd9b78e0734100a058fb9714 (patch) | |
| tree | ffe93c1e8a98eb85abd2513dd9359ae1b19d9abe /.drone.yml | |
| parent | 593118204a5a8d5c54423e9424d8469689ceed19 (diff) | |
Use PHP built-in web server instead of Apache in Drone
Instead of running an additional Drone service with the Nextcloud server
now the Nextcloud server is run in the same Drone step as the acceptance
tests themselves using the PHP built-in web server.
Thanks to this, the Nextcloud server control is no longer needed, as the
acceptance tests can now directly reset, start and stop the Nextcloud
server. Also, the "nextcloudci/php7.0:php7.0-7" image provides
everything needed to run and manage the Nextcloud server (including the
Git command used to restore the directory to a saved state), so the
custom image is no longer needed either.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to '.drone.yml')
| -rw-r--r-- | .drone.yml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/.drone.yml b/.drone.yml index 16f4be6a39a..9996b5df5cf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -478,19 +478,6 @@ pipeline: when: matrix: TESTS: integration-trashbin - # As it needs access to the cloned Git repository it must be defined in the - # pipeline as "detached" instead of in the services. - service-acceptance-nextcloud-server: - image: nextcloudci/acceptance-nextcloud-server-php7.1-apache - detach: true - commands: - # "nextcloud-server-control-setup.sh" can not be set as the entry point in - # the image because Drone overrides it. - - /usr/local/bin/nextcloud-server-control-setup.sh - - su --shell "/bin/sh" --command "php /usr/local/bin/nextcloud-server-control.php 12345" - www-data - when: - matrix: - TESTS: acceptance acceptance-access-levels: image: nextcloudci/php7.0:php7.0-7 commands: |