From 7bb849a4058e9de0f230473d0919bcd285a02467 Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Fri, 27 Sep 2019 21:41:54 +0300
Subject: [PATCH 1/3] Updated volumes for better segmentation

---
 docker-compose.yml                 | 17 ++++++++++-------
 tests/resources/docker-compose.yml |  5 ++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5678589447..2cd1d9bb4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,10 @@ services:
     build: .
     restart: unless-stopped
     volumes:
-    - .:/usr/share/nginx/html
+    - ./app:/usr/share/nginx/html/app
+    - ./public:/usr/share/nginx/html/public
+    - ./src:/usr/share/nginx/html/src
+    - ./vendor:/usr/share/nginx/html/vendor
     - ./docker/nginx.conf:/etc/nginx/nginx.conf:rw
     - ./storage/uploads:/storage/uploads:rw
     - ./storage/cache:/storage/cache:rw
@@ -13,12 +16,12 @@ services:
     - "80:80"
     - "443:443"
     depends_on:
-      - mariadb
-      - redis
-      - smtp
-      - clamav
-      - influxdb
-      - telegraf
+    - mariadb
+    - redis
+    - smtp
+    - clamav
+    - influxdb
+    - telegraf
     environment:
     - _APP_ENV=development
     - _APP_OPENSSL_KEY_V1=your-secret-key
diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml
index 5076a037ac..5538a7ebef 100644
--- a/tests/resources/docker-compose.yml
+++ b/tests/resources/docker-compose.yml
@@ -5,7 +5,10 @@ services:
     build: ../../
     restart: unless-stopped
     volumes:
-    - ./../../:/usr/share/nginx/html
+    - ./../../app:/usr/share/nginx/html/app
+    - ./../../public:/usr/share/nginx/html/public
+    - ./../../src:/usr/share/nginx/html/src
+    - ./../../vendor:/usr/share/nginx/html/vendor
     - ./../../docker/nginx.conf:/etc/nginx/nginx.conf:rw
     - ./../../storage/uploads:/storage/uploads:rw
     - ./../../storage/cache:/storage/cache:rw

From 60611af26f0dcfd29d4ed3469d971d402b7916a3 Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Sat, 28 Sep 2019 02:00:30 +0300
Subject: [PATCH 2/3] Fixed typo

---
 app/config/services.php  | 2 +-
 app/controllers/auth.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/config/services.php b/app/config/services.php
index a56d708628..85c313cfbb 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -19,7 +19,7 @@ return [
     ],
     'v1/auth' => [ // Add to docs later: You can also learn how to [configure support for our supported OAuth providers](/docs/oauth)
         'name' => 'Auth',
-        'description' => "The authentication service allows you to verify users accounts using basic email and password login or with a supported OAuth provider. The auth service also exposes methods to confirm users email account and recover users forgotten passwords.\n\n. You can review our currently available OAuth providers from your project console under the **'users'** menu.",
+        'description' => "The authentication service allows you to verify users accounts using basic email and password login or with a supported OAuth provider. The auth service also exposes methods to confirm users email account and recover users forgotten passwords.\n\nYou can review our currently available OAuth providers from your project console under the **'users'** menu.",
         'controller' => 'controllers/auth.php',
         'sdk' => true,
     ],
diff --git a/app/controllers/auth.php b/app/controllers/auth.php
index f7c9fb2ecd..073abcab00 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/auth.php
@@ -30,7 +30,7 @@ $utopia->post('/v1/auth/register')
     ->label('abuse-limit', 10)
     ->param('email', '', function () {return new Email();}, 'Account email')
     ->param('password', '', function () {return new Password();}, 'User password')
-    ->param('confirmation', '', function () use ($clients) {return new Host($clients);}, 'Confirmation URL to redirect user after confirm token has been sent to user email')
+    ->param('confirmation', '', function () use ($clients) {return new Host($clients);}, 'Confirmation URL to redirect user after confirm token has been sent to user email') // TODO add our own built-in confirm page
     ->param('success', null, function () use ($clients) {return new Host($clients);}, 'Redirect when registration succeed', true)
     ->param('failure', null, function () use ($clients) {return new Host($clients);}, 'Redirect when registration failed', true)
     ->param('name', '', function () {return new Text(100);}, 'User name', true)

From 0ff576b3e941f3723b60e13dcfc206891ded7a1b Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Sat, 28 Sep 2019 02:01:59 +0300
Subject: [PATCH 3/3] Synced dev and test envs settings

---
 tests/resources/docker-compose.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml
index 5538a7ebef..29a630b908 100644
--- a/tests/resources/docker-compose.yml
+++ b/tests/resources/docker-compose.yml
@@ -15,6 +15,13 @@ services:
     ports:
     - "80:80"
     - "443:443"
+    depends_on:
+    - mariadb
+    - redis
+    - smtp
+    - clamav
+    - influxdb
+    - telegraf
     environment:
     - _APP_ENV=development
     - _APP_OPTIONS_ABUSE=disabled