From 823f5325df405286024cdf2a985732baabc0981f Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Wed, 21 Mar 2018 22:00:26 +0100 Subject: Add Dockerfile for simple Master/Slave replication and add more parametrization --- .../share/container-scripts/mysql/galera-common.sh | 61 ---------------------- .../mysql/galera-init/60-galera-config.sh | 6 --- .../mysql/galera-init/galera.cnf.template | 21 -------- .../mysql/galera-init/galera.cnf.template.maria | 17 ------ .../container-scripts/mysql/galera/cluster.cnf | 4 -- .../mysql/galera/configure-galera.sh | 48 ----------------- .../mysql/init/50-galera-passwd-change.sh | 14 ----- .../container-scripts/mysql/init/51-extradb.sh | 14 ----- .../share/container-scripts/mysql/init/52-super.sh | 12 ----- .../share/container-scripts/mysql/init/53-pma.sh | 26 --------- 10 files changed, 223 deletions(-) delete mode 100644 root-galera/usr/share/container-scripts/mysql/galera-common.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/galera-init/60-galera-config.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template delete mode 100644 root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template.maria delete mode 100644 root-galera/usr/share/container-scripts/mysql/galera/cluster.cnf delete mode 100755 root-galera/usr/share/container-scripts/mysql/galera/configure-galera.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/init/50-galera-passwd-change.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/init/51-extradb.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/init/52-super.sh delete mode 100644 root-galera/usr/share/container-scripts/mysql/init/53-pma.sh (limited to 'root-galera/usr/share') diff --git a/root-galera/usr/share/container-scripts/mysql/galera-common.sh b/root-galera/usr/share/container-scripts/mysql/galera-common.sh deleted file mode 100644 index b4d90e5..0000000 --- a/root-galera/usr/share/container-scripts/mysql/galera-common.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -source ${CONTAINER_SCRIPTS_PATH}/common.sh - -# Initialize the MySQL database (create user accounts and the initial database) -function initialize_galera_database() { - log_info 'Initializing database ...' - if [[ "$MYSQL_VERSION" < "5.7" ]] ; then - # Using --rpm since we need mysql_install_db behaves as in RPM - log_info 'Running mysql_install_db ...' - mysql_install_db --rpm --datadir=$MYSQL_DATADIR - else - log_info "Running mysqld --initialize-insecure ..." - ${MYSQL_PREFIX}/libexec/mysqld --wsrep-on=OFF --wsrep-provider=none --initialize-insecure --datadir=$MYSQL_DATADIR --ignore-db-dir=lost+found "$@" - fi - - start_local_mysql --wsrep-on=OFF --wsrep-provider=none "$@" - - if [ -v MYSQL_RUNNING_AS_SLAVE ]; then - log_info 'Initialization finished' - return 0 - fi - - # Do not care what option is compulsory here, just create what is specified - if [ -v MYSQL_USER ]; then - log_info "Creating user specified by MYSQL_USER (${MYSQL_USER}) ..." -mysql $mysql_flags < "5.6" ]] ; then - mysql $mysql_flags < /etc/my.cnf.d/galera.cnf -fi diff --git a/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template b/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template deleted file mode 100644 index b45dc85..0000000 --- a/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template +++ /dev/null @@ -1,21 +0,0 @@ -[mysqld] -wsrep_on = ON -wsrep_provider = /usr/lib64/galera-3/libgalera_smm.so -wsrep_sst_auth=${MYSQL_GALERA_USER}:${MYSQL_GALERA_PASSWORD} -wsrep_cluster_name=${MYSQL_GALERA_CLUSTER} -#wsrep_provider_options="gcache.size=500M; gcache.page_size=500M" -wsrep_sst_method = xtrabackup-v2 -default_storage_engine = innodb -binlog_format = row - -#MySQL tuning -#max_threads = 128 -#key_buffer_size = 1024K -#sort_buffer_size = 1024K -#read_buffer_size = 1024K - -# Performance settings -innodb_autoinc_lock_mode = 2 -innodb_flush_log_at_trx_commit = 0 -query_cache_size = 0 -query_cache_type = 0 diff --git a/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template.maria b/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template.maria deleted file mode 100644 index 3adbf58..0000000 --- a/root-galera/usr/share/container-scripts/mysql/galera-init/galera.cnf.template.maria +++ /dev/null @@ -1,17 +0,0 @@ -[galera] -wsrep_on = ON -wsrep_provider = /usr/lib64/galera/libgalera_smm.so -wsrep_sst_method = xtrabackup-v2 -default_storage_engine = innodb -binlog_format = row -innodb_autoinc_lock_mode = 2 -innodb_flush_log_at_trx_commit = 0 -query_cache_size = 0 -query_cache_type = 0 - -wsrep_sst_auth=${MYSQL_GALERA_USER}:${MYSQL_GALERA_PASSWORD} -wsrep_cluster_name=${MYSQL_GALERA_CLUSTER} - -# By default every node is standalone -wsrep_cluster_address=gcomm:// -wsrep_node_address=127.0.0.1 diff --git a/root-galera/usr/share/container-scripts/mysql/galera/cluster.cnf b/root-galera/usr/share/container-scripts/mysql/galera/cluster.cnf deleted file mode 100644 index 5e9d444..0000000 --- a/root-galera/usr/share/container-scripts/mysql/galera/cluster.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqld] -# By default every node is standalone -wsrep_cluster_address=gcomm:// -wsrep_node_address=127.0.0.1 diff --git a/root-galera/usr/share/container-scripts/mysql/galera/configure-galera.sh b/root-galera/usr/share/container-scripts/mysql/galera/configure-galera.sh deleted file mode 100755 index 05829a4..0000000 --- a/root-galera/usr/share/container-scripts/mysql/galera/configure-galera.sh +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/bash - -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script writes out a mysql galera config using a list of newline seperated -# peer DNS names it accepts through stdin. - -# /etc/mysql is assumed to be a shared volume so we can modify my.cnf as required -# to keep the config up to date, without wrapping mysqld in a custom pid1. -# The config location is intentionally not /etc/mysql/my.cnf because the -# standard base image clobbers that location. -CFG=/etc/my.cnf.d/cluster.cnf - -function join { - local IFS="$1"; shift; echo "$*"; -} - -HOSTNAME=$(hostname) -while read -ra LINE; do - if [[ "${LINE}" == *"${HOSTNAME}"* ]]; then - MY_NAME=$LINE - fi - PEERS=("${PEERS[@]}" $LINE) -done - -if [ "${#PEERS[@]}" = 1 ]; then - WSREP_CLUSTER_ADDRESS="" -else - WSREP_CLUSTER_ADDRESS=$(join , "${PEERS[@]}") -fi - -sed -i -e "s|^wsrep_node_address=.*$|wsrep_node_address=${MY_NAME}|" ${CFG} -sed -i -e "s|^wsrep_cluster_address=.*$|wsrep_cluster_address=gcomm://${WSREP_CLUSTER_ADDRESS}|" ${CFG} - -# don't need a restart, we're just writing the conf in case there's an -# unexpected restart on the node. diff --git a/root-galera/usr/share/container-scripts/mysql/init/50-galera-passwd-change.sh b/root-galera/usr/share/container-scripts/mysql/init/50-galera-passwd-change.sh deleted file mode 100644 index 2844d5f..0000000 --- a/root-galera/usr/share/container-scripts/mysql/init/50-galera-passwd-change.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -password_change() { -mysql $mysql_flags <