From 59bbf66b7b1e4490694f2c5f732ddf9380acf053 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 28 Nov 2015 20:11:25 +0100
Subject: debugging on services. renaming service and use of extends in global
 docker-copose used in test

---
 docker-compose.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 2bf7971..92639ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,17 @@
-fedora:
-  build: OS/
-  container_name: "startx-fedora"
-  command: cat /etc/redhat-release
-
+os:
+  extends:
+    file: OS/docker-compose.yml
+    service: fedora
+    
 apache:
-  build: Services/apache/
-  container_name: "startx-sv-apache"
-
+  extends:
+    file: Services/apache/docker-compose.yml
+    service: server
+    
 php:
-  build: Services/php/
-  container_name: "startx-sv-php"
+  extends:
+    file: Services/php/docker-compose.yml
+    service: server
 
 #mariadb:
 #  build: Services/mariadb/
-- 
cgit v1.2.1