Merge pull request #22 from tutumcloud/staging

refactored tags, created tests

Author: fermayo

Dockerfile renamed to 5.5/Dockerfile

@@ -2,8 +2,10 @@ FROM ubuntu:trusty
 MAINTAINER Fernando Mayo <[email protected]>, Feng Honglin <[email protected]>
 
 # Install packages
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server pwgen
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && \
+  apt-get -yq install mysql-server-5.5 pwgen && \
+  rm -rf /var/lib/apt/lists/*
 
 # Remove pre-installed database
 RUN rm -rf /var/lib/mysql/*

create_db.sh renamed to 5.5/create_db.sh

@@ -5,6 +5,9 @@ VOLUME_HOME="/var/lib/mysql"
 if [[ ! -d $VOLUME_HOME/mysql ]]; then
     echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME"
     echo "=> Installing MySQL ..."
+    if [ ! -f /usr/share/mysql/my-default.cnf ] ; then
+        cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf
+    fi 
     mysql_install_db > /dev/null 2>&1
     echo "=> Done!"  
     /create_mysql_admin_user.sh

create_mysql_admin_user.sh renamed to 5.5/create_mysql_admin_user.sh

@@ -0,0 +1,31 @@
+FROM ubuntu:trusty
+MAINTAINER Fernando Mayo <[email protected]>, Feng Honglin <[email protected]>
+
+# Install packages
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && \
+  apt-get -yq install mysql-server-5.6 pwgen && \
+  rm -rf /var/lib/apt/lists/*
+
+# Remove pre-installed database
+RUN rm -rf /var/lib/mysql/*
+
+# Add MySQL configuration
+ADD my.cnf /etc/mysql/conf.d/my.cnf
+ADD mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf
+
+# Add MySQL scripts
+ADD create_mysql_admin_user.sh /create_mysql_admin_user.sh
+ADD import_sql.sh /import_sql.sh
+ADD run.sh /run.sh
+RUN chmod 755 /*.sh
+
+# Exposed ENV
+ENV MYSQL_USER admin
+ENV MYSQL_PASS **Random**
+
+# Add VOLUMEs to allow backup of config and databases
+VOLUME  ["/etc/mysql", "/var/lib/mysql"]
+
+EXPOSE 3306
+CMD ["/run.sh"]

import_sql.sh renamed to 5.5/import_sql.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [[ $# -eq 0 ]]; then
+	echo "Usage: $0 <db_name>"
+	exit 1
+fi
+
+/usr/bin/mysqld_safe > /dev/null 2>&1 &
+
+echo "=> Creating database $1"
+RET=1
+while [[ RET -ne 0 ]]; do
+	sleep 5
+	mysql -uroot -e "CREATE DATABASE $1"
+	RET=$?
+done
+
+mysqladmin -uroot shutdown
+
+echo "=> Done!"

my.cnf renamed to 5.5/my.cnf

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+/usr/bin/mysqld_safe > /dev/null 2>&1 &
+
+RET=1
+while [[ RET -ne 0 ]]; do
+    echo "=> Waiting for confirmation of MySQL service startup"
+    sleep 5
+    mysql -uroot -e "status" > /dev/null 2>&1
+    RET=$?
+done
+
+if [ "$MYSQL_PASS" = "**Random**" ]; then
+    unset MYSQL_PASS
+fi
+
+PASS=${MYSQL_PASS:-$(pwgen -s 12 1)}
+_word=$( [ ${MYSQL_PASS} ] && echo "preset" || echo "random" )
+echo "=> Creating MySQL user ${MYSQL_USER} with ${_word} password"
+
+mysql -uroot -e "CREATE USER '${MYSQL_USER}'@'%' IDENTIFIED BY '$PASS'"
+mysql -uroot -e "GRANT ALL PRIVILEGES ON *.* TO '${MYSQL_USER}'@'%' WITH GRANT OPTION"
+
+
+echo "=> Done!"
+
+echo "========================================================================"
+echo "You can now connect to this MySQL Server using:"
+echo ""
+echo "    mysql -u$MYSQL_USER -p$PASS -h<host> -P<port>"
+echo ""
+echo "Please remember to change the above password as soon as possible!"
+echo "MySQL user 'root' has no password but only allows local connections"
+echo "========================================================================"
+
+mysqladmin -uroot shutdown