aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-03 09:12:38 +0000
committerJeff Peeler <jpeeler@redhat.com>2015-09-03 21:00:23 +0000
commit3487d8da14a82f8f01d0c58293c5f6597a9e4422 (patch)
treeb19f5dd2d139283e5da19d01cf16faed84db54ea /docker
parenta2d4a9481c4b6dd072918384c2aebd68d75dd783 (diff)
downloadkolla-3487d8da14a82f8f01d0c58293c5f6597a9e4422.tar.gz
kolla-3487d8da14a82f8f01d0c58293c5f6597a9e4422.zip
Rename Galera to MariaDB
Change-Id: I3134ba72e2ce4e85a17facbc3b5af4c1c3438d33 Closes-Bug: #1491740
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j22
-rw-r--r--docker/mariadb/Dockerfile.j2 (renamed from docker/galera/Dockerfile.j2)0
-rw-r--r--docker/mariadb/config-external.sh (renamed from docker/galera/config-external.sh)0
-rwxr-xr-xdocker/mariadb/config-galera.sh (renamed from docker/galera/config-galera.sh)0
-rwxr-xr-xdocker/mariadb/start.sh (renamed from docker/galera/start.sh)0
5 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index be54e9bee..cd41257f9 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV KOLLA_INSTALL_TYPE {{ install_type }}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-# Turns on galera repos throughout the build
+# Turns on MariaDB repos throughout the build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
diff --git a/docker/galera/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 38e66ee14..38e66ee14 100644
--- a/docker/galera/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
diff --git a/docker/galera/config-external.sh b/docker/mariadb/config-external.sh
index 43447a51c..43447a51c 100644
--- a/docker/galera/config-external.sh
+++ b/docker/mariadb/config-external.sh
diff --git a/docker/galera/config-galera.sh b/docker/mariadb/config-galera.sh
index cfdd7d9a2..cfdd7d9a2 100755
--- a/docker/galera/config-galera.sh
+++ b/docker/mariadb/config-galera.sh
diff --git a/docker/galera/start.sh b/docker/mariadb/start.sh
index 986cca733..986cca733 100755
--- a/docker/galera/start.sh
+++ b/docker/mariadb/start.sh