summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Closset <cc697w@intl.att.com>2017-03-08 17:10:09 +0000
committerGerrit Code Review <gerrit@openecomp.org>2017-03-08 17:10:09 +0000
commita6593a68ec3237a00cb0a2e51b838991b10a205f (patch)
tree6650720111d368cd49cf9468718ff1ac5da4d57e
parent60760692af59cfd30cdf3d481087d00f09fcf8e9 (diff)
parentfa8b0c33032fc2a02c03f62f712b08263d159036 (diff)
Merge "Remove duplicate docker-compose"
-rw-r--r--docker-compose.yml34
1 files changed, 0 insertions, 34 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index eb089abead..0000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '2'
-
-services:
- mariadb:
- image: mariadb:10.1.11
- ports:
- - "3306"
- volumes:
- - ./volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- - ./volumes/mariadb/conf.d:/etc/mysql/conf.d
- environment:
- - MYSQL_ROOT_PASSWORD=password
- hostname:
- db.mso.testlab.openecomp.org
- logging:
- driver: "json-file"
- options:
- max-size: "30m"
- max-file: "5"
-
- mso:
- image: openecomp/mso
- ports:
- - "3904:3904"
- - "3905:3905"
- - "8080:8080"
- - "9990:9990"
- volumes:
- - ./volumes/mso/chef-config:/shared
- environment:
- - MYSQL_ROOT_PASSWORD=password
- hostname:
- mso.mso.testlab.openecomp.org
-