Update

Author: viljaste

README.md

@@ -18,28 +18,27 @@ Using the `docker` command:
       -p 3306:3306 \
       --volumes-from mysql-data \
       -e TIMEZONE="Etc/UTC" \
-      -e PASSWORD="root" \
       -e GENERAL_LOG="0" \
       -e SLOW_QUERY_LOG="0" \
       -e LONG_QUERY_TIME="1" \
       -d \
-      dockerizedrupal/mysql:1.0.8
+      dockerizedrupal/mysql:1.0.9
 
 Using the `docker-compose` command
 
     TMP="$(mktemp -d)" \
       && git clone https://github.com/dockerizedrupal/docker-mysql.git "${TMP}" \
       && cd "${TMP}" \
-      && git checkout 1.0.8 \
+      && git checkout 1.0.9 \
       && sudo docker-compose up
 
 ## Build the image
 
     TMP="$(mktemp -d)" \
       && git clone https://github.com/dockerizedrupal/docker-mysql.git "${TMP}" \
       && cd "${TMP}" \
-      && git checkout 1.0.8 \
-      && sudo docker build -t dockerizedrupal/mysql:1.0.8 . \
+      && git checkout 1.0.9 \
+      && sudo docker build -t dockerizedrupal/mysql:1.0.9 . \
       && cd -
 
 ## Back up MySQL data

VERSION.md

@@ -1 +1 @@
-1.0.8
+1.0.9

docker-compose.yml

@@ -1,13 +1,12 @@
 mysql:
-  image: dockerizedrupal/mysql:1.0.8
+  image: dockerizedrupal/mysql:1.0.9
   hostname: mysql
   ports:
     - "3306:3306"
   volumes_from:
     - mysql-data
   environment:
     - TIMEZONE=Etc/UTC
-    - PASSWORD=root
     - GENERAL_LOG=0
     - SLOW_QUERY_LOG=0
     - LONG_QUERY_TIME=1

src/mysql/run.sh

@@ -5,6 +5,9 @@ puppet apply --modulepath=/src/mysql/run/modules /src/mysql/run/run.pp
 DATA="/mysql/data"
 
 if [ ! "$(ls -A ${DATA})" ]; then
+  USER="container"
+  PASSWORD="container"
+
   mysql_install_db --user="mysql" > /dev/null 2>&1
   mysqld_safe > /dev/null 2>&1 &
 
@@ -23,9 +26,9 @@ if [ ! "$(ls -A ${DATA})" ]; then
 
   mysql -u root -e "CREATE USER 'root'@'%' IDENTIFIED BY '${PASSWORD}';"
   mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;"
+  mysql -u root -e "RENAME USER 'root' TO '${USER}';"
 
-  mysqladmin -u root password "${PASSWORD}"
-  mysqladmin -u root -p"${PASSWORD}" shutdown
+  mysqladmin -u "${USER}" -p"${PASSWORD}" shutdown
 fi
 
 chown -R mysql.mysql "${DATA}"

src/mysql/variables.sh

@@ -6,10 +6,6 @@ fi
 
 export FACTER_TIMEZONE="${TIMEZONE}"
 
-if [ -z "${PASSWORD}" ]; then
-  export PASSWORD="root"
-fi
-
 if [ -z "${GENERAL_LOG}" ]; then
   GENERAL_LOG="0"
 fi