diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-09 05:54:20 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-09 05:57:35 -0700 |
| commit | 0c57f4ec9650253df4ea508abedb3433e547fa2a (patch) | |
| tree | 8d2f8c129fe8adc09ae45cb12af38103306881c2 /docker/centos | |
| parent | 0b63b64d051df5241ea8a6de733fb418ef66498a (diff) | |
| download | kolla-0c57f4ec9650253df4ea508abedb3433e547fa2a.tar.gz kolla-0c57f4ec9650253df4ea508abedb3433e547fa2a.zip | |
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
Diffstat (limited to 'docker/centos')
6 files changed, 0 insertions, 30 deletions
diff --git a/docker/centos/binary/mariadb/mariadb-app/Dockerfile b/docker/centos/binary/mariadb/mariadb-app/Dockerfile deleted file mode 100644 index e1cfee562..000000000 --- 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 ec1913803..000000000 --- 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 d09342261..000000000 --- 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 39b4add9e..000000000 --- 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 f60599d16..000000000 --- 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 ec1913803..000000000 --- a/docker/centos/binary/mariadb/mariadb-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file |