Merge remote-tracking branch 'upstream/master'

Conflicts:
	5.5/docker-entrypoint.sh
	5.6/docker-entrypoint.sh
	5.7/docker-entrypoint.sh

Author: ltangvald

5.5/Dockerfile

@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y libaio1 && rm -rf /var/lib/apt/lists/*
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5
 
 ENV MYSQL_MAJOR 5.5
-ENV MYSQL_VERSION 5.5.42
+ENV MYSQL_VERSION 5.5.43
 
 # note: we're pulling the *.asc file from mysql.he.net instead of dev.mysql.com because the official mirror 404s that file for whatever reason - maybe it's at a different path?
 RUN apt-get update && apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \

5.5/docker-entrypoint.sh

@@ -10,6 +10,7 @@ get_option () {
 	echo $ret
 }
 
+# if command starts with an option, prepend mysqld
 if [ "${1:0:1}" = '-' ]; then
 	set -- mysqld "$@"
 fi
@@ -53,6 +54,10 @@ if [ "$1" = 'mysqld' ]; then
 
 		tempSqlFile=$(mktemp /tmp/mysql-first-time.XXXXXX.sql)
 		cat > "$tempSqlFile" <<-EOSQL
+			-- What's done in this file shouldn't be replicated
+			--  or products like mysql-fabric won't work
+			SET @@SESSION.SQL_LOG_BIN=0;
+			
 			DELETE FROM mysql.user ;
 			CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
 			GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;

5.6/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y perl --no-install-recommends && rm -rf
 RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5
 
 ENV MYSQL_MAJOR 5.6
-ENV MYSQL_VERSION 5.6.23
+ENV MYSQL_VERSION 5.6.24
 
 RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 

5.6/docker-entrypoint.sh

@@ -10,6 +10,7 @@ get_option () {
 	echo $ret
 }
 
+# if command starts with an option, prepend mysqld
 if [ "${1:0:1}" = '-' ]; then
 	set -- mysqld "$@"
 fi
@@ -52,6 +53,10 @@ if [ "$1" = 'mysqld' ]; then
 
 		tempSqlFile=$(mktemp /tmp/mysql-first-time.XXXXXX.sql)
 		cat > "$tempSqlFile" <<-EOSQL
+			-- What's done in this file shouldn't be replicated
+			--  or products like mysql-fabric won't work
+			SET @@SESSION.SQL_LOG_BIN=0;
+			
 			DELETE FROM mysql.user ;
 			CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
 			GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;

5.7/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y perl --no-install-recommends && rm -rf
 RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5
 
 ENV MYSQL_MAJOR 5.7
-ENV MYSQL_VERSION 5.7.5-m15
+ENV MYSQL_VERSION 5.7.6-m16
 
 RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}-dmr" > /etc/apt/sources.list.d/mysql.list
 

5.7/docker-entrypoint.sh

@@ -10,6 +10,7 @@ get_option () {
 	echo $ret
 }
 
+# if command starts with an option, prepend mysqld
 if [ "${1:0:1}" = '-' ]; then
 	set -- mysqld "$@"
 fi
@@ -31,9 +32,10 @@ if [ "$1" = 'mysqld' ]; then
 		fi
 		chown -R mysql:mysql "$DATADIR"
 
-		echo 'Running mysql_install_db'
-		mysql_install_db --user=mysql --datadir="$DATADIR" --insecure --mysqld-file=/usr/sbin/mysqld
-		echo 'Finished mysql_install_db'
+		echo 'Initializing database'
+		mysqld --initialize-insecure=on --datadir="$DATADIR"
+		echo 'Database initialized'
+
 		mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
 		for i in $(seq 30 -1 0); do
 			[ -S $SOCKET ] && break
@@ -45,16 +47,16 @@ if [ "$1" = 'mysqld' ]; then
 			exit 1
 		fi
 
-		# Workaround for bug in 5.7 that doesn't clean up after itself correctly 
-		rm $DATADIR/ib_logfile0
-		rm $DATADIR/ib_logfile1
-		rm $DATADIR/ibdata1
 		# 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:
 
 		tempSqlFile=$(mktemp /tmp/mysql-first-time.XXXXXX.sql)
 		cat > "$tempSqlFile" <<-EOSQL
+			-- What's done in this file shouldn't be replicated
+			--  or products like mysql-fabric won't work
+			SET @@SESSION.SQL_LOG_BIN=0;
+			
 			DELETE FROM mysql.user ;
 			CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
 			GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;