openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make mariadb use a data container without a bindmount"

Browse Source
This commit is contained in:
Jenkins 2015-03-23 20:09:09 +00:00 committed by Gerrit Code Review
commit 3d37fd95d7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compose/mariadb.yml
View File

@ -1,14 +1,12 @@
mariadbdata: mariadbdata:
image: kollaglue/centos-rdo-mariadb-data image: kollaglue/centos-rdo-mariadb-data
volumes: name: mariadbdata
- /var/lib/mysql:/var/lib/mysql
net: "host"
privileged: true
mariadbapp: mariadbapp:
image: kollaglue/centos-rdo-mariadb-app image: kollaglue/centos-rdo-mariadb-app
name: mariadbapp
env_file: env_file:
- openstack.env - openstack.env
volumes_from: volumes_from:
- mariadbdata - mariadbdata
net: "host" net: "host"
privileged: true

2
docker/mariadb-data/Dockerfile
View File

@ -1,6 +1,8 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/mysql" ]
# Command needed to start the data container. # Command needed to start the data container.
# Note: data containers do not need to be persistent. # Note: data containers do not need to be persistent.
CMD ["/bin/sh"] CMD ["/bin/sh"]