From aa59c96e7869656c660395a202d1508f1343b626 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 5 Dec 2015 19:11:11 +0100
Subject: correcting bug in memcache docker-compose config and change in test
 script.

---
 docker-compose.yml | 84 +++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 09f6215..db3ad25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,45 +8,45 @@ server_apache:
     file: Services/apache/docker-compose.yml
     service: server
 
-#server_php:
-#  extends:
-#    file: Services/php/docker-compose.yml
-#    service: server
-
-#server_mariadb:
-#  extends:
-#    file: Services/mariadb/docker-compose.yml
-#    service: server
-
-#server_memcache:
-#  extends:
-#    file: Services/memcache/docker-compose.yml
-#    service: server
-
-#server_mongo:
-#  extends:
-#    file: Services/mongo/docker-compose.yml
-#    service: server
-#
-#server_nodejs:
-#  extends:
-#    file: Services/nodejs/docker-compose.yml
-#    service: server
-#
-#server_ooconv:
-#  extends:
-#    file: Services/ooconv/docker-compose.yml
-#    service: server
-
-#server_postgres:
-#  extends:
-#    file: Services/postgres/docker-compose.yml
-#    service: server
-
-#pma:
-#  build: Applications/phpmyadmin/
-#  container_name: "startx-app-phpmyadmin"
-#
-#rockmongo:
-#  build: Applications/rockmongo/
-#  container_name: "startx-app-rockmongo"
\ No newline at end of file
+server_php:
+  extends:
+    file: Services/php/docker-compose.yml
+    service: server
+
+server_nodejs:
+  extends:
+    file: Services/nodejs/docker-compose.yml
+    service: server
+
+server_mariadb:
+  extends:
+    file: Services/mariadb/docker-compose.yml
+    service: server
+
+server_postgres:
+  extends:
+    file: Services/postgres/docker-compose.yml
+    service: server
+
+server_mongo:
+  extends:
+    file: Services/mongo/docker-compose.yml
+    service: server
+
+server_ooconv:
+  extends:
+    file: Services/ooconv/docker-compose.yml
+    service: server
+
+server_memcache:
+  extends:
+    file: Services/memcache/docker-compose.yml
+    service: server
+
+pma:
+  build: Applications/phpmyadmin/
+  container_name: "startx-app-phpmyadmin"
+
+rockmongo:
+  build: Applications/rockmongo/
+  container_name: "startx-app-rockmongo"
\ No newline at end of file
-- 
cgit v1.2.1