diff options
| author | startxfr <clarue@startx.fr> | 2015-11-28 22:23:16 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-28 22:23:16 +0100 |
| commit | 42c264a48c9d7df0b5e55be370436e3ec0bb7667 (patch) | |
| tree | adb0a692f3cffa85d3f13a8feafcbdd40a9dde88 /docker-compose.yml | |
| parent | 73a7d45fe8fe7a69fd7689ce4d8283dc91f87fc9 (diff) | |
| download | phpmyadmin-42c264a48c9d7df0b5e55be370436e3ec0bb7667.tar.gz phpmyadmin-42c264a48c9d7df0b5e55be370436e3ec0bb7667.tar.bz2 phpmyadmin-42c264a48c9d7df0b5e55be370436e3ec0bb7667.tar.xz phpmyadmin-42c264a48c9d7df0b5e55be370436e3ec0bb7667.zip | |
adding mariadb to travis test
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 9 |
1 files changed, 5 insertions, 4 deletions
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/ |