diff options
| author | startxfr <clarue@startx.fr> | 2015-12-05 19:11:11 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-05 19:11:11 +0100 |
| commit | aa59c96e7869656c660395a202d1508f1343b626 (patch) | |
| tree | 62b614ee9f7e2db36909714610924bf10f341d06 /docker-compose.yml | |
| parent | a656803d2375dce6e5dcdf5bd334335260b4ae53 (diff) | |
| download | phpmyadmin-aa59c96e7869656c660395a202d1508f1343b626.tar.gz phpmyadmin-aa59c96e7869656c660395a202d1508f1343b626.tar.bz2 phpmyadmin-aa59c96e7869656c660395a202d1508f1343b626.tar.xz phpmyadmin-aa59c96e7869656c660395a202d1508f1343b626.zip | |
correcting bug in memcache docker-compose config and change in test script.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 84 |
1 files changed, 42 insertions, 42 deletions
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 |