diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-02-25 05:49:40 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-03-20 16:17:51 +0000 |
| commit | 5547b5fe786b7491d2e33f92c4082535f2bb56cf (patch) | |
| tree | c90551eafcd645f37de33e051913b91f5a126026 /docker/mariadb | |
| parent | fb425db56db16ec4ac061a2ee49054eed4fc284a (diff) | |
| download | kolla-5547b5fe786b7491d2e33f92c4082535f2bb56cf.tar.gz kolla-5547b5fe786b7491d2e33f92c4082535f2bb56cf.zip | |
Implements: blueprint Implement a database container set
Previously, the database container was configured for use with
Kubernetes. This patch removed any k8s dependencies, adds a script
to manage mysql server.cnf settings and splits data and app
containers. Splitting the containers provides additional
portability and operational efficiencies compared to host mounts.
Change-Id: I80656450c02dda5f2959d187eec20d5877dc54a2
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile | 13 | ||||
| l--------- | docker/mariadb/build | 1 | ||||
| -rwxr-xr-x | docker/mariadb/entrypoint.sh | 47 |
3 files changed, 0 insertions, 61 deletions
diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile deleted file mode 100644 index b0aa27bbd..000000000 --- a/docker/mariadb/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install mariadb-galera-server hostname; yum clean all -ADD /entrypoint.sh /entrypoint.sh - -VOLUME /var/lib/mysql -VOLUME /var/log/mariadb - -EXPOSE 3306 - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["mysqld_safe"] diff --git a/docker/mariadb/build b/docker/mariadb/build deleted file mode 120000 index d2accf7d3..000000000 --- a/docker/mariadb/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/mariadb/entrypoint.sh b/docker/mariadb/entrypoint.sh deleted file mode 100755 index 898823352..000000000 --- a/docker/mariadb/entrypoint.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -set -e - -: ${MYSQL_ROOT_PASSWORD:=$DB_ROOT_PASSWORD} - -if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then - PATH=/usr/libexec:$PATH - export PATH - - if [ -z "$MYSQL_ROOT_PASSWORD" ]; then - echo >&2 'error: database is uninitialized and MYSQL_ROOT_PASSWORD not set' - echo >&2 ' Did you forget to add -e MYSQL_ROOT_PASSWORD=... ?' - exit 1 - fi - - mysql_install_db --user=mysql --datadir=/var/lib/mysql - - # These statements _must_ be on individual lines, and _must_ end with - # semicolons (no line breaks or comments are permitted). - # TODO proper SQL escaping on ALL the things D: - TEMP_FILE='/tmp/mysql-first-time.sql' - cat > "$TEMP_FILE" <<-EOSQL - DELETE FROM mysql.user ; - CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; - GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ; - DROP DATABASE IF EXISTS test ; - EOSQL - - if [ "$MYSQL_DATABASE" ]; then - echo "CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE ;" >> "$TEMP_FILE" - fi - - if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then - echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" >> "$TEMP_FILE" - - if [ "$MYSQL_DATABASE" ]; then - echo "GRANT ALL ON $MYSQL_DATABASE.* TO '$MYSQL_USER'@'%' ;" >> "$TEMP_FILE" - fi - fi - - echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE" - - set -- "$@" --init-file="$TEMP_FILE" -fi - -chown -R mysql:mysql /var/lib/mysql -exec "$@" |