summaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 20:11:25 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 20:11:25 +0100
commit59bbf66b7b1e4490694f2c5f732ddf9380acf053 (patch)
tree4fa52b027fc6df1c9b50c3fbaf740086b595b786 /docker-compose.yml
parent348568c89ae1ad19270e930c02a1492bc43e99b1 (diff)
downloadphpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.gz
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.bz2
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.xz
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.zip
debugging on services. renaming service and use of extends in global docker-copose used in test
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml22
1 files changed, 12 insertions, 10 deletions
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/