From 0c57f4ec9650253df4ea508abedb3433e547fa2a Mon Sep 17 00:00:00 2001 From: Steven Dake <stdake@cisco.com> Date: Sun, 9 Aug 2015 05:54:20 -0700 Subject: [PATCH] Remove mariadb container We don't need a mariadb container since the galera container does exactly the same thing. A followup patch will rename galera to mariadb as soon as the galera remove-config-internal patches merge. Change-Id: I3d1b31cf01e5584ebb1199e3e3ec63a2a32827bc Partial-Bug: #1482987 --- .../binary/mariadb/mariadb-app/Dockerfile | 18 ------------------ docker/centos/binary/mariadb/mariadb-app/build | 1 - .../binary/mariadb/mariadb-app/config-mysql.sh | 1 - .../mariadb/mariadb-app/mysql-entrypoint.sh | 1 - .../binary/mariadb/mariadb-data/Dockerfile | 8 -------- .../centos/binary/mariadb/mariadb-data/build | 1 - docker/fedora/binary/mariadb | 1 - docker/rhel/binary/mariadb | 1 - 8 files changed, 32 deletions(-) delete mode 100644 docker/centos/binary/mariadb/mariadb-app/Dockerfile delete mode 120000 docker/centos/binary/mariadb/mariadb-app/build delete mode 120000 docker/centos/binary/mariadb/mariadb-app/config-mysql.sh delete mode 120000 docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh delete mode 100644 docker/centos/binary/mariadb/mariadb-data/Dockerfile delete mode 120000 docker/centos/binary/mariadb/mariadb-data/build delete mode 120000 docker/fedora/binary/mariadb delete mode 120000 docker/rhel/binary/mariadb diff --git a/docker/centos/binary/mariadb/mariadb-app/Dockerfile b/docker/centos/binary/mariadb/mariadb-app/Dockerfile deleted file mode 100644 index e1cfee562d..0000000000 --- a/docker/centos/binary/mariadb/mariadb-app/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install packages -# TODO check if hostname pkg is needed. -RUN yum -y install mariadb \ - mariadb-server \ - MySQL-python \ - hostname \ - && yum clean all - -# Add mysql configuration scripts -COPY config-mysql.sh /opt/kolla/config-mysql.sh -COPY mysql-entrypoint.sh /opt/kolla/mysql-entrypoint.sh - -# start mysql -ENTRYPOINT ["/opt/kolla/mysql-entrypoint.sh"] -CMD ["mysqld_safe"] diff --git a/docker/centos/binary/mariadb/mariadb-app/build b/docker/centos/binary/mariadb/mariadb-app/build deleted file mode 120000 index ec19138031..0000000000 --- a/docker/centos/binary/mariadb/mariadb-app/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh b/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh deleted file mode 120000 index d093422611..0000000000 --- a/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/mariadb-app/config-mysql.sh \ No newline at end of file diff --git a/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh b/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh deleted file mode 120000 index 39b4add9ea..0000000000 --- a/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/mariadb-app/mysql-entrypoint.sh \ No newline at end of file diff --git a/docker/centos/binary/mariadb/mariadb-data/Dockerfile b/docker/centos/binary/mariadb/mariadb-data/Dockerfile deleted file mode 100644 index f60599d163..0000000000 --- a/docker/centos/binary/mariadb/mariadb-data/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -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/bash"] diff --git a/docker/centos/binary/mariadb/mariadb-data/build b/docker/centos/binary/mariadb/mariadb-data/build deleted file mode 120000 index ec19138031..0000000000 --- a/docker/centos/binary/mariadb/mariadb-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/fedora/binary/mariadb b/docker/fedora/binary/mariadb deleted file mode 120000 index 98bd30c5d9..0000000000 --- a/docker/fedora/binary/mariadb +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/mariadb \ No newline at end of file diff --git a/docker/rhel/binary/mariadb b/docker/rhel/binary/mariadb deleted file mode 120000 index 98bd30c5d9..0000000000 --- a/docker/rhel/binary/mariadb +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/mariadb \ No newline at end of file