Merge pull request docker-library#84 from mysql/master

Specify protocol for client during init

Author: tianon

5.5/Dockerfile

@@ -1,5 +1,4 @@
 FROM debian:wheezy
-
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
 
@@ -39,15 +38,12 @@ ENV PATH $PATH:/usr/local/mysql/bin:/usr/local/mysql/scripts
 # replicate some of the way the APT package configuration works
 # this is only for 5.5 since it doesn't have an APT repo, and will go away when 5.5 does
 RUN mkdir -p /etc/mysql/conf.d \
-	&& { \
-		echo '[mysqld]'; \
-		echo '!includedir /etc/mysql/conf.d/'; \
-	} > /etc/mysql/my.cnf \
 	&& { \
 		echo '[mysqld]'; \
 		echo 'user = mysql'; \
 		echo 'datadir = /var/lib/mysql'; \
-	} > /etc/mysql/conf.d/docker.cnf
+		echo '!includedir /etc/mysql/conf.d/'; \
+	} > /etc/mysql/my.cnf
 
 VOLUME /var/lib/mysql
 

5.5/docker-entrypoint.sh

@@ -79,7 +79,7 @@ if [ "$1" = 'mysqld' ]; then
 
 		echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
 
-		mysql -uroot < "$tempSqlFile"
+		mysql --protocol=socket -uroot < "$tempSqlFile"
 
 		rm -f "$tempSqlFile"
 		kill $(cat $PIDFILE)

5.6/docker-entrypoint.sh

@@ -78,7 +78,7 @@ if [ "$1" = 'mysqld' ]; then
 
 		echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
 
-		mysql -uroot < "$tempSqlFile"
+		mysql --protocol=socket -uroot < "$tempSqlFile"
 
 		rm -f "$tempSqlFile"
 		kill $(cat $PIDFILE)

5.7/docker-entrypoint.sh

@@ -78,7 +78,7 @@ if [ "$1" = 'mysqld' ]; then
 
 		echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
 
-		mysql -uroot < "$tempSqlFile"
+		mysql --protocol=socket -uroot < "$tempSqlFile"
 
 		rm -f "$tempSqlFile"
 		kill $(cat $PIDFILE)