From 2d675fa3573a00d844254df0ca0412e122865a69 Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Thu, 14 Nov 2019 06:37:24 +0200
Subject: [PATCH] Using docker volumes for better permission control

---
 docker-compose.yml                 | 17 ++++++++++++-----
 tests/resources/docker-compose.yml | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 34e7954ae9..bc4840f543 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     build: .
     restart: unless-stopped
     volumes:
+    - appwrite-uploads:/storage/uploads:rw
+    - appwrite-cache:/storage/cache:rw
     - ./app:/usr/share/nginx/html/app
     - ./docs:/usr/share/nginx/html/docs
     - ./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
     ports:
     - "80:80"
     - "443:443"
@@ -47,9 +47,10 @@ services:
     - MYSQL_USER=user
     - MYSQL_PASSWORD=password
     volumes:
-    - ./storage/db:/var/lib/mysql:rw
+    - appwrite-db:/var/lib/mysql:rw
     ports:
     - 3306:3306/tcp
+    command: 'mysqld --innodb-flush-method=fsync'
 
   smtp:
     image: appwrite/smtp:1.0.0
@@ -63,7 +64,7 @@ services:
     image: appwrite/clamav:1.0.4
     restart: unless-stopped
     volumes:
-    - ./storage:/storage:rw
+    - appwrite-uploads:/storage/uploads
 
   redis:
     image: redis:5.0
@@ -72,7 +73,7 @@ services:
   influxdb:
     image: influxdb:1.6
     volumes:
-    - ./storage/influxdb:/var/lib/influxdb
+    - appwrite-influxdb:/var/lib/influxdb:rw
     ports:
     - "8086:8086"
 
@@ -80,3 +81,9 @@ services:
     image: appwrite/telegraf:1.0.0
     ports:
     - "8125:8125/udp"
+
+volumes:
+  appwrite-db:
+  appwrite-cache:
+  appwrite-uploads:
+  appwrite-influxdb:
\ No newline at end of file
diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml
index 29a630b908..d5c5c57f33 100644
--- a/tests/resources/docker-compose.yml
+++ b/tests/resources/docker-compose.yml
@@ -10,8 +10,8 @@ services:
     - ./../../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
+    - ./../.appwrite-uploads:/storage/uploads:rw
+    - ./../.appwrite-cache:/storage/cache:rw
     ports:
     - "80:80"
     - "443:443"
@@ -62,7 +62,7 @@ services:
     image: appwrite/clamav:1.0.4
     restart: unless-stopped
     volumes:
-    - ./storage:/storage:rw
+    - appwrite-uploads:/storage/uploads
       
   redis:
     image: redis:5.0
@@ -71,11 +71,17 @@ services:
   influxdb:
     image: influxdb:1.6
     volumes:
-    - ./storage/influxdb:/var/lib/influxdb
+    - appwrite-influxdb:/var/lib/influxdb:rw
     ports:
     - "8086:8086"
 
   telegraf:
     image: appwrite/telegraf:1.0.0
     ports:
-    - "8125:8125/udp"
\ No newline at end of file
+    - "8125:8125/udp"
+
+volumes:
+  appwrite-db:
+  appwrite-cache:
+  appwrite-uploads:
+  appwrite-influxdb:
\ No newline at end of file