From 95f6b5e2145b90b0db46fa4676c2a3f91f2266da Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Mon, 21 May 2018 13:03:44 +0200
Subject: [PATCH] No data volumes for tests instances in Docker

---
 .travis.yml              |  8 ++++----
 docker-compose-tests.yml | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose-tests.yml

diff --git a/.travis.yml b/.travis.yml
index 37e88fa..af5b21a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ script:
  - cp -r tests/fixtures/me.yml config/me.yml
  - docker-compose up -d
  - docker-compose ps
- - WEB_PORT=5006 DATA_DIR=tests/fixtures/instance1/data CONFIG_DIR=tests/fixtures/instance1/config docker-compose -p instance1 up -d
- - docker-compose -p instance1 ps
- - WEB_PORT=5007 DATA_DIR=tests/fixtures/instance2/data CONFIG_DIR=tests/fixtures/instance2/config docker-compose -p instance2 up -d
- - docker-compose -p instance2 ps
+ - WEB_PORT=5006 CONFIG_DIR=./tests/fixtures/instance1/config docker-compose -p instance1 -f docker-compose-tests.yml up -d
+ - docker-compose -p instance1 -f docker-compose-tests.yml ps
+ - WEB_PORT=5007 CONFIG_DIR=./tests/fixtures/instance2/config docker-compose -p instance2 -f docker-compose-tests.yml up -d
+ - docker-compose -p instance2 -f docker-compose-tests.yml ps
  - pytest -v --ignore data
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
new file mode 100644
index 0000000..d41baf8
--- /dev/null
+++ b/docker-compose-tests.yml
@@ -0,0 +1,32 @@
+version: '3'
+services:
+  web:
+    build: .
+    ports:
+     - "${WEB_PORT}:5005"
+    links:
+     - mongo
+     - rmq
+    volumes:
+     - "${CONFIG_DIR}:/app/config"
+     - "./static:/app/static"
+    environment:
+     - MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rmq//
+     - MICROBLOGPUB_MONGODB_HOST=mongo:27017
+  celery:
+    build: .
+    links:
+     - mongo
+     - rmq
+    command: 'celery worker -l info -A tasks'
+    environment:
+     - MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rmq//
+     - MICROBLOGPUB_MONGODB_HOST=mongo:27017
+  mongo:
+    image: "mongo:latest"
+  rmq:
+    image: "rabbitmq:latest"
+    hostname: "my-rabbit"
+    environment:
+     - RABBITMQ_ERLANG_COOKIE=secretrabbit
+     - RABBITMQ_NODENAME=rabbit@my-rabbit