diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-21 20:18:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-21 20:18:44 +0000 |
| commit | f14b229b1023c8808f07cdeedf875961bb923b0c (patch) | |
| tree | c0012038cfefd176c75bbb0f4ac014983c63ec0d /docker_templates | |
| parent | dc2a7a006a2d66300cce7f9c8cf1ed00a79afab3 (diff) | |
| parent | 8f7ff277794a3daac354cff1eb2b2d5537b77d64 (diff) | |
| download | kolla-f14b229b1023c8808f07cdeedf875961bb923b0c.tar.gz kolla-f14b229b1023c8808f07cdeedf875961bb923b0c.zip | |
Merge "Fix MariaDB for ubuntu"
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/galera/Dockerfile.j2 | 16 |
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 %} |
