Merge pull request #7 from infosiftr/5.7

Add the 5.7.4-m14 Development Release

Author: yosifkit

5.6/docker-entrypoint.sh

@@ -15,8 +15,9 @@ if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then
 	# TODO proper SQL escaping on ALL the things D:
 	TEMP_FILE='/tmp/mysql-first-time.sql'
 	cat > "$TEMP_FILE" <<-EOSQL
-		UPDATE mysql.user SET host = "%", password = PASSWORD("${MYSQL_ROOT_PASSWORD}") WHERE user = "root" LIMIT 1 ;
-		DELETE FROM mysql.user WHERE user != "root" OR host != "%" ;
+		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
 

5.7/Dockerfile

@@ -0,0 +1,40 @@
+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
+
+RUN apt-get update && apt-get install -y \
+		bison \
+		build-essential \
+		cmake \
+		curl \
+		libncurses5-dev
+
+ENV MYSQL_MAJOR 5.7
+ENV MYSQL_VERSION 5.7.4-m14
+
+RUN mkdir /usr/src/mysql \
+	&& curl -SL "https://dev.mysql.com/get/Downloads/MySQL-$MYSQL_MAJOR/mysql-$MYSQL_VERSION.tar.gz" \
+		| tar -xzC /usr/src/mysql --strip-components=1 \
+	&& cd /usr/src/mysql \
+	&& cmake . -DCMAKE_BUILD_TYPE=Release \
+		-DWITH_EMBEDDED_SERVER=OFF \
+	&& make -j"$(nproc)" \
+	&& make test \
+	&& make install \
+	&& cd .. \
+	&& rm -rf mysql \
+	&& rm -rf /usr/local/mysql/mysql-test \
+	&& rm -rf /usr/local/mysql/sql-bench \
+	&& find /usr/local/mysql -type f -name "*.a" -delete \
+	&& { find /usr/local/mysql -type f -executable -exec strip --strip-all '{}' + || true; }
+ENV PATH $PATH:/usr/local/mysql/bin:/usr/local/mysql/scripts
+
+WORKDIR /usr/local/mysql
+VOLUME /var/lib/mysql
+
+ADD docker-entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+EXPOSE 3306
+CMD ["mysqld", "--datadir=/var/lib/mysql", "--user=mysql"]

5.7/docker-entrypoint.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -e
+
+if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then
+	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 "$@"

generate-stackbrew-library.sh

@@ -17,7 +17,12 @@ echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 for version in "${versions[@]}"; do
 	commit="$(git log -1 --format='format:%H' "$version")"
 	fullVersion="$(grep -m1 'ENV MYSQL_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)"
-	versionAliases=( $fullVersion $version ${aliases[$version]} )
+	versionAliases=()
+	while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+		versionAliases+=( $fullVersion )
+		fullVersion="${fullVersion%[.-]*}"
+	done
+	versionAliases+=( $version ${aliases[$version]} )
 
 	echo
 	for va in "${versionAliases[@]}"; do