From 42c264a48c9d7df0b5e55be370436e3ec0bb7667 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 28 Nov 2015 22:23:16 +0100
Subject: adding mariadb to travis test

---
 docker-compose.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 92639ef..037c201 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,10 +12,11 @@ php:
   extends:
     file: Services/php/docker-compose.yml
     service: server
-
-#mariadb:
-#  build: Services/mariadb/
-#  container_name: "startx-sv-mariadb"
+    
+mariadb:
+  extends:
+    file: Services/mariadb/docker-compose.yml
+    service: server
 
 #memcache:
 #  build: Services/memcache/
-- 
cgit v1.2.3