aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-03-21 16:17:01 -0700
committerSteven Dake <stdake@cisco.com>2015-03-22 08:55:24 -0700
commitc2b92c5e96857ea88f8b01df8a81b6418087a259 (patch)
tree1187f6445becbd3cb1919c6180844e8f58ef46e6
parentf4fd47dc2cdb5eee6ac366788c25c2a6a21ca362 (diff)
downloadkolla-c2b92c5e96857ea88f8b01df8a81b6418087a259.tar.gz
kolla-c2b92c5e96857ea88f8b01df8a81b6418087a259.zip
Make mariadb use a data container without a bindmount
A data container is meant to operate without bindmounts. Change-Id: I2624a63fd75db7ed8050054c17e19885f8a7ac8a Co-Authored-By: Daneyon Hansen (danehans@cisco.com)
-rw-r--r--compose/mariadb.yml8
-rw-r--r--docker/mariadb-data/Dockerfile2
2 files changed, 5 insertions, 5 deletions
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index d93c7b26c..5a60c3ef0 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,14 +1,12 @@
mariadbdata:
image: kollaglue/centos-rdo-mariadb-data
- volumes:
- - /var/lib/mysql:/var/lib/mysql
- net: "host"
- privileged: true
+ name: mariadbdata
+
mariadbapp:
image: kollaglue/centos-rdo-mariadb-app
+ name: mariadbapp
env_file:
- openstack.env
volumes_from:
- mariadbdata
net: "host"
- privileged: true
diff --git a/docker/mariadb-data/Dockerfile b/docker/mariadb-data/Dockerfile
index 4f1a9b455..a55831311 100644
--- a/docker/mariadb-data/Dockerfile
+++ b/docker/mariadb-data/Dockerfile
@@ -1,6 +1,8 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
+VOLUME [ "/var/lib/mysql" ]
+
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/sh"]