From 5968395919deb6b19f79239662c2062002a4afb1 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 22 Jan 2019 09:52:18 +0545
Subject: [PATCH] Run local server in its own folder

---
 .drone.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 75a65c33..ca6024f7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 workspace:
   base: /var/www/owncloud
-  path: apps/encryption
+  path: server/apps/encryption
 
 branches: [master, release*, release/*]
 
@@ -8,6 +8,7 @@ pipeline:
   install-core:
     image: owncloudci/core
     version: ${OC_VERSION}
+    core_path: /var/www/owncloud/server
     pull: true
     exclude: "apps/encryption"
     db_type: ${DB_TYPE}
@@ -58,7 +59,7 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - cd /var/www/owncloud/
+      - cd /var/www/owncloud/server
       - php occ a:l
       - php occ a:e encryption
       - php occ a:e testing
@@ -77,9 +78,9 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - chown www-data /var/www/owncloud -R
-      - chmod 777 /var/www/owncloud/tests/acceptance/filesForUpload -R
-      - chmod +x /var/www/owncloud/tests/acceptance/run.sh
+      - chown www-data /var/www/owncloud/server -R
+      - chmod 777 /var/www/owncloud/server/tests/acceptance/filesForUpload -R
+      - chmod +x /var/www/owncloud/server/tests/acceptance/run.sh
     when:
       matrix:
         NEED_SERVER: true
@@ -89,7 +90,7 @@ pipeline:
     detach: true
     pull: true
     commands:
-      - tail -f /var/www/owncloud/data/owncloud.log
+      - tail -f /var/www/owncloud/server/data/owncloud.log
     when:
       matrix:
         NEED_SERVER: true
@@ -107,7 +108,7 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - cd /var/www/owncloud
+      - cd /var/www/owncloud/server
       #- php ./occ app:check-code encryption -c private -c strong-comparison
       - php ./occ app:check-code encryption -c deprecation
     when:
@@ -119,7 +120,7 @@ pipeline:
     image: owncloudci/php:7.1
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phpstan
     when:
@@ -131,7 +132,7 @@ pipeline:
     image: owncloudci/php:7.0
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -143,7 +144,7 @@ pipeline:
     image: owncloudci/php:7.1
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -155,7 +156,7 @@ pipeline:
     image: owncloudci/php:7.2
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -266,7 +267,7 @@ services:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     environment:
-      - APACHE_WEBROOT=/var/www/owncloud
+      - APACHE_WEBROOT=/var/www/owncloud/server
     command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ]
     when:
       matrix: