Generate configuration file with envsubst

5.5/Dockerfile

@@ -24,14 +24,13 @@ EXPOSE 3306
 # to make sure of that.
 RUN rpmkeys --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
     yum -y --setopt=tsflags=nodocs install https://www.softwarecollections.org/en/scls/rhscl/mysql55/epel-7-x86_64/download/rhscl-mysql55-epel-7-x86_64.noarch.rpm && \
-    yum -y --setopt=tsflags=nodocs install hostname mysql55 && \
+    yum -y --setopt=tsflags=nodocs install gettext hostname mysql55 && \
     yum clean all && \
     mkdir -p /var/lib/mysql/data && chown mysql.mysql /var/lib/mysql/data && \
     test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"
 
 COPY run-mysqld.sh /usr/local/bin/
-COPY contrib/.bashrc /var/lib/mysql/
-COPY contrib/etc /opt/openshift/etc/
+COPY contrib /var/lib/mysql/
 
 VOLUME ["/var/lib/mysql/data"]
 

5.5/Dockerfile.rhel7

@@ -22,7 +22,7 @@ EXPOSE 3306
 # This image must forever use UID 27 for mysql user so our volumes are
 # safe in the future. This should *never* change, the last test is there
 # to make sure of that.
-RUN yum install -y yum-utils hostname && \
+RUN yum install -y yum-utils gettext hostname && \
     yum-config-manager --enable rhel-server-rhscl-7-rpms && \
     yum-config-manager --enable rhel-7-server-optional-rpms && \
     yum install -y --setopt=tsflags=nodocs mysql55 && \
@@ -31,8 +31,7 @@ RUN yum install -y yum-utils hostname && \
     test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"
 
 COPY run-mysqld.sh /usr/local/bin/
-COPY contrib/.bashrc /var/lib/mysql/
-COPY contrib/etc /opt/openshift/etc/
+COPY contrib /var/lib/mysql/
 
 VOLUME ["/var/lib/mysql/data"]
 

5.5/contrib/my.cnf.template

@@ -0,0 +1,37 @@
+[mysqld]
+user = mysql
+
+datadir = ${MYSQL_DATADIR}
+basedir = /opt/rh/mysql55/root/usr
+plugin-dir = /opt/rh/mysql55/root/usr/lib64/mysql/plugin
+
+general_log = ON
+
+# Disable unix socket
+socket =
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links = 0
+
+# http://www.percona.com/blog/2008/05/31/dns-achilles-heel-mysql-installation/
+skip_name_resolve
+
+#
+# Settings configured by the user
+#
+
+# Sets how the table names are stored and compared. Default: 0
+lower_case_table_names = ${MYSQL_LOWER_CASE_TABLE_NAMES}
+
+# The maximum permitted number of simultaneous client connections. Default: 151
+max_connections = ${MYSQL_MAX_CONNECTIONS}
+
+# The minimum length of the word to be included in a FULLTEXT index. Default: 4
+ft_min_word_len = ${MYSQL_FT_MIN_WORD_LEN}
+
+# The maximum length of the word to be included in a FULLTEXT index. Default: 20
+ft_max_word_len = ${MYSQL_FT_MAX_WORD_LEN}
+
+# In case the native AIO is broken. Default: 1
+# See http://help.directadmin.com/item.php?id=529
+innodb_use_native_aio = ${MYSQL_AIO}

5.5/run-mysqld.sh

@@ -6,10 +6,17 @@ source $HOME/.bashrc
 set -eu
 
 # Data directory where MySQL database files live. The data subdirectory is here
-# because .bashrc lives in /var/lib/mysql/ and we don't want a volume to
-# override it.
-MYSQL_DATADIR=/var/lib/mysql/data
-MYSQL_DEFAULTS_FILE=/opt/openshift/etc/my.cnf
+# because .bashrc and my.cnf both live in /var/lib/mysql/ and we don't want a
+# volume to override it.
+export MYSQL_DATADIR=/var/lib/mysql/data
+
+# Configuration settings.
+export MYSQL_DEFAULTS_FILE=$HOME/my.cnf
+export MYSQL_LOWER_CASE_TABLE_NAMES=${MYSQL_LOWER_CASE_TABLE_NAMES:-0}
+export MYSQL_MAX_CONNECTIONS=${MYSQL_MAX_CONNECTIONS:-151}
+export MYSQL_FT_MIN_WORD_LEN=${MYSQL_FT_MIN_WORD_LEN:-4}
+export MYSQL_FT_MAX_WORD_LEN=${MYSQL_FT_MAX_WORD_LEN:-20}
+export MYSQL_AIO=${MYSQL_AIO:-1}
 
 # Be paranoid and stricter than we should be.
 # https://dev.mysql.com/doc/refman/5.5/en/identifiers.html
@@ -26,10 +33,20 @@ function usage() {
 	echo "  \$MYSQL_DATABASE (regex: '$mysql_identifier_regex')"
 	echo "Optional:"
 	echo "  \$MYSQL_ROOT_PASSWORD (regex: '$mysql_password_regex')"
+	echo "Settings:"
+	echo "  \$MYSQL_LOWER_CASE_TABLE_NAMES (default: 0)"
+	echo "  \$MYSQL_MAX_CONNECTIONS (default: 151)"
+	echo "  \$MYSQL_FT_MIN_WORD_LEN (default: 4)"
+	echo "  \$MYSQL_FT_MAX_WORD_LEN (default: 20)"
+	echo "  \$MYSQL_AIO (default: 1)"
 	exit 1
 }
 
 function check_env_vars() {
+	if ! [[ -v MYSQL_USER && -v MYSQL_PASSWORD && -v MYSQL_DATABASE ]]; then
+		usage
+	fi
+
 	[[ "$MYSQL_USER"     =~ $mysql_identifier_regex ]] || usage "Invalid MySQL username"
 	[ ${#MYSQL_USER} -le 16 ] || usage "MySQL username too long (maximum 16 characters)"
 	[[ "$MYSQL_PASSWORD" =~ $mysql_password_regex   ]] || usage "Invalid password"
@@ -60,9 +77,7 @@ function wait_for_mysql() {
 	done
 }
 
-if [ "$1" = "mysqld" -a ! -d "$MYSQL_DATADIR/mysql" ]; then
-
-	shift
+function initialize_database() {
 	check_env_vars
 
 	echo 'Running mysql_install_db'
@@ -94,6 +109,18 @@ if [ "$1" = "mysqld" -a ! -d "$MYSQL_DATADIR/mysql" ]; then
 		EOSQL
 	fi
 	mysqladmin $admin_flags flush-privileges shutdown
+}
+
+# New config is generated every time a container is created.
+envsubst < ${MYSQL_DEFAULTS_FILE}.template > $MYSQL_DEFAULTS_FILE
+
+if [ "$1" = "mysqld" ]; then
+
+	shift
+
+	if [ ! -d "$MYSQL_DATADIR/mysql" ]; then
+		initialize_database
+	fi
 
 	unset_env_vars
 

5.5/test/run

@@ -139,6 +139,25 @@ function run_container_creation_tests() {
 	echo "  Success!"
 }
 
+function test_config_option() {
+	local env_var=$1 ; shift
+	local setting=$1 ; shift
+	local value=$1 ; shift
+
+	# If $value is a string, it needs to be in simple quotes ''.
+	# If nothing is found, grep returns 1 and test fails.
+	docker run --rm -e $env_var=${value//\'/} $IMAGE_NAME cat /var/lib/mysql/my.cnf | grep -q "$setting = $value"
+}
+
+function run_configuration_tests() {
+	echo "  Testing image configuration settings"
+	test_config_option MYSQL_LOWER_CASE_TABLE_NAMES lower_case_table_names 1
+	test_config_option MYSQL_MAX_CONNECTIONS max_connections 1337
+	test_config_option MYSQL_FT_MIN_WORD_LEN ft_min_word_len 8
+	test_config_option MYSQL_FT_MAX_WORD_LEN ft_max_word_len 15
+	echo "  Success!"
+}
+
 function run_tests() {
 	local name=$1 ; shift
 	envs="-e MYSQL_USER=$USER -e MYSQL_PASSWORD=$PASS -e MYSQL_DATABASE=db"
@@ -165,5 +184,6 @@ function run_tests() {
 # Tests.
 
 run_container_creation_tests
+run_configuration_tests
 USER=user PASS=pass run_tests no_root
 USER=user1 PASS=pass1 ROOT_PASS=r00t run_tests root

README.md

@@ -34,6 +34,16 @@ The image recognizes following environment variables that you can set during ini
 |  `MYSQL_DATABASE`      | Database name                             |
 |  `MYSQL_ROOT_PASSWORD` | Password for the root user (optional)     |
 
+Following environment variables influence MySQL configuration file. They are all optional.
+
+|    Variable name                |    Description                                                    |    Default
+| :------------------------------ | ----------------------------------------------------------------- | -------------------------------
+|  `MYSQL_LOWER_CASE_TABLE_NAMES` | Sets how the table names are stored and compared                  |  0
+|  `MYSQL_MAX_CONNECTIONS`        | The maximum permitted number of simultaneous client connections   |  151
+|  `MYSQL_FT_MIN_WORD_LEN`        | The minimum length of the word to be included in a FULLTEXT index |  4
+|  `MYSQL_FT_MAX_WORD_LEN`        | The maximum length of the word to be included in a FULLTEXT index |  20
+|  `MYSQL_AIO`                    | Controls the `innodb_use_native_aio` setting value in case the native AIO is broken. See http://help.directadmin.com/item.php?id=529 |  1
+
 You can also set following mount points by passing `-v /host:/container` flag to docker.
 
 |  Volume mount point      | Description          |