diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-12 16:31:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-12 16:31:11 +0000 |
| commit | af03af45bdbb8e4396a44f244ad29a4dc8daee47 (patch) | |
| tree | c924b6cd28ad409c41a43f0df1e5dc4cec0a1cbd | |
| parent | 51575ddf849b10db91d81bfff7d26a4177fdfa7a (diff) | |
| parent | 0c57f4ec9650253df4ea508abedb3433e547fa2a (diff) | |
| download | kolla-af03af45bdbb8e4396a44f244ad29a4dc8daee47.tar.gz kolla-af03af45bdbb8e4396a44f244ad29a4dc8daee47.zip | |
Merge "Remove mariadb container"
| -rw-r--r-- | docker/centos/binary/mariadb/mariadb-app/Dockerfile | 18 | ||||
| l--------- | docker/centos/binary/mariadb/mariadb-app/build | 1 | ||||
| l--------- | docker/centos/binary/mariadb/mariadb-app/config-mysql.sh | 1 | ||||
| l--------- | docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh | 1 | ||||
| -rw-r--r-- | docker/centos/binary/mariadb/mariadb-data/Dockerfile | 8 | ||||
| l--------- | docker/centos/binary/mariadb/mariadb-data/build | 1 | ||||
| l--------- | docker/fedora/binary/mariadb | 1 | ||||
| l--------- | docker/rhel/binary/mariadb | 1 |
8 files changed, 0 insertions, 32 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 diff --git a/docker/fedora/binary/mariadb b/docker/fedora/binary/mariadb deleted file mode 120000 index 98bd30c5d..000000000 --- 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 98bd30c5d..000000000 --- a/docker/rhel/binary/mariadb +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/mariadb
\ No newline at end of file |