From 9e65cc93a188e157a38652125cc36d8327f4161b Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Fri, 29 Nov 2019 20:41:40 +0200
Subject: [PATCH] Using dev docker-compose for testing and development

---
 .travis.yml                        |  6 +-
 docker-compose.yml                 |  1 +
 tests/resources/docker-compose.yml | 92 ------------------------------
 3 files changed, 4 insertions(+), 95 deletions(-)
 delete mode 100644 tests/resources/docker-compose.yml

diff --git a/.travis.yml b/.travis.yml
index b558aa17e..d36d73680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,14 @@ services:
 #   directories:
 #   - docker_images
 
-before_install:
-- docker load -i docker_images/images.tar || true
+# before_install:
+# - docker load -i docker_images/images.tar || true
 
 # before_cache:
 # - docker save -o docker_images/images.tar $(docker images -a -q)
 
 install:
-- docker-compose -f tests/resources/docker-compose.yml up -d
+- docker-compose up -d
 - sleep 90
 
 script:
diff --git a/docker-compose.yml b/docker-compose.yml
index dedb38e25..82358db84 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
       - telegraf
     environment:
     - _APP_ENV=development
+    - _APP_OPTIONS_ABUSE=disabled
     - _APP_OPENSSL_KEY_V1=your-secret-key
     - _APP_REDIS_HOST=redis
     - _APP_REDIS_PORT=6379
diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml
deleted file mode 100644
index 9b78323e7..000000000
--- a/tests/resources/docker-compose.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-version: '3'
-
-services:
-  appwrite:
-    container_name: appwrite
-    build:
-      context: ../../
-      args:
-        - TESTING=true
-    restart: unless-stopped
-    volumes:
-    - appwrite-uploads:/storage/uploads:rw
-    - appwrite-cache:/storage/cache:rw
-    - ./../../phpunit.xml:/usr/share/nginx/html/phpunit.xml
-    - ./../../tests:/usr/share/nginx/html/tests
-    - ./../../app:/usr/share/nginx/html/app
-    - ./../../public:/usr/share/nginx/html/public
-    - ./../../src:/usr/share/nginx/html/src
-    - ./../../docker/nginx.conf:/etc/nginx/nginx.conf:rw
-    ports:
-    - "80:80"
-    - "443:443"
-    depends_on:
-    - mariadb
-    - redis
-    - smtp
-    - clamav
-    - influxdb
-    - telegraf
-    environment:
-    - _APP_ENV=development
-    - _APP_OPTIONS_ABUSE=disabled
-    - _APP_OPENSSL_KEY_V1=just-a-random-key
-    - _APP_REDIS_HOST=redis
-    - _APP_REDIS_PORT=6379
-    - _APP_DB_HOST=mariadb
-    - _APP_DB_PORT=3306
-    - _APP_DB_SCHEMA=appwrite
-    - _APP_DB_USER=user
-    - _APP_DB_PASS=password
-    - _APP_INFLUXDB_HOST=influxdb
-    - _APP_INFLUXDB_PORT=8086
-    - _APP_STATSD_HOST=telegraf
-    - _APP_STATSD_PORT=8125
-
-  mariadb:
-    image: appwrite/mariadb:1.0.1
-    restart: unless-stopped
-    environment:
-    - MYSQL_ROOT_PASSWORD=rootsecretpassword
-    - MYSQL_DATABASE=appwrite
-    - MYSQL_USER=user
-    - MYSQL_PASSWORD=password
-    ports:
-    - 3306:3306/tcp
-    #command: mysqld --innodb-flush-method=fsync
-
-  smtp:
-    image: appwrite/smtp:1.0.0
-    environment:
-    - MAILNAME=appwrite
-    - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16
-    ports:
-    - "25:25"
-
-  clamav:
-    image: appwrite/clamav:1.0.4
-    restart: unless-stopped
-    volumes:
-    - appwrite-uploads:/storage/uploads
-      
-  redis:
-    image: redis:5.0
-    restart: unless-stopped
-
-  influxdb:
-    image: influxdb:1.6
-    volumes:
-    - appwrite-influxdb:/var/lib/influxdb:rw
-    ports:
-    - "8086:8086"
-
-  telegraf:
-    image: appwrite/telegraf:1.0.0
-    ports:
-    - "8125:8125/udp"
-
-volumes:
-  appwrite-db:
-  appwrite-cache:
-  appwrite-uploads:
-  appwrite-influxdb: