aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-20 14:32:34 +0000
committerSam Yaple <sam@yaple.net>2015-08-21 13:10:05 +0000
commit8f7ff277794a3daac354cff1eb2b2d5537b77d64 (patch)
tree3ed9c90e4835e4e2b8f048fed4e21376a56a9286 /docker_templates
parent91088e595ff2406231eae707d9ca71a2ad36199c (diff)
downloadkolla-8f7ff277794a3daac354cff1eb2b2d5537b77d64.tar.gz
kolla-8f7ff277794a3daac354cff1eb2b2d5537b77d64.zip
Fix MariaDB for ubuntu
In MariaDB we adjust the dependecies of what we install there as well adding only what is appropriate for the install. In Ansible we adjust some templates to all work around differences between the different Linux families. Change-Id: Ibc26e2f4d4a732630632d3ed27fb595b6fe019d2 Partially-Implements: blueprint install-from-ubuntu
Diffstat (limited to 'docker_templates')
-rw-r--r--docker_templates/galera/Dockerfile.j216
1 files changed, 12 insertions, 4 deletions
diff --git a/docker_templates/galera/Dockerfile.j2 b/docker_templates/galera/Dockerfile.j2
index 2d656053a..7856a7f24 100644
--- a/docker_templates/galera/Dockerfile.j2
+++ b/docker_templates/galera/Dockerfile.j2
@@ -26,10 +26,18 @@ RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN ["/bin/false"]
-
-# TODO(sdake) when ubuntu support is implemented we will need a line
-# && rm -rf /var/lib/mysql/
+# At the end of this run statement we symlink two folders to match the folder
+# structure of the RPM family for mysql configs. This allows us to not change
+# the config-external.sh code
+# TODO(SamYaple): Remove that symlink once config-external is updated
+RUN apt-get install -y --no-install-recommends \
+ mariadb-galera-server \
+ percona-xtrabackup \
+ socat \
+ expect \
+ && apt-get clean \
+ && rm -rf /var/lib/mysql/* \
+ && ln -s /etc/mysql/conf.d/ /etc/my.cnf.d
{% endif %}