renamed root password variable and added root user variable, added more gripes for missing variables, added explicit upstream version tag

Author: nickbreen

Dockerfile

@@ -1,26 +1,22 @@
-FROM nickbreen/wp-cli
+FROM nickbreen/wp-cli:v1.0.0
 
 MAINTAINER Nick Breen <nick@foobar.net.nz>
 
-ENV MYSQL_ROOT_PASSWORD="" \
+ENV WP_DB_ROOT_USER="root" \
+    WP_DB_ROOT_PASSWORD="" \
     WP_LOCALE="" \
     WP_DB_HOST="" \
     WP_DB_PORT="" \
     WP_DB_NAME="" \
     WP_DB_USER="" \
     WP_DB_PASSWORD="" \
     WP_DB_PREFIX="" \
+    WP_SUBDOMAINS="" \
     WP_URL="" \
     WP_TITLE="" \
     WP_ADMIN_USER="" \
     WP_ADMIN_PASSWORD="" \
     WP_ADMIN_EMAIL="" \
-    WP_THEMES="" \
-    BB_THEMES="" \
-    WP_PLUGINS="" \
-    BB_PLUGINS="" \
-    WP_OPTIONS="" \
-    WP_IMPORT="" \
     WP_EXTRA_PHP=""
 
 RUN mkdir -p /usr/local/share/php/

setup.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
 
 # Juggle ENV VARS
-: ${MYSQL_ROOT_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
+: ${WP_DB_ROOT_USER:=root}
+: ${WP_DB_ROOT_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
 : ${WP_DB_NAME:=$MYSQL_ENV_MYSQL_DATABASE}
 : ${WP_DB_USER:=$MYSQL_ENV_MYSQL_USER}
 : ${WP_DB_PASSWORD:=$MYSQL_ENV_MYSQL_PASSWORD}
 : ${WP_DB_HOST:=$MYSQL_PORT_3306_TCP_ADDR}
 : ${WP_DB_PORT:=${MYSQL_PORT_3306_TCP_PORT:-3306}}
-: ${WP_NETWORK:-no}
 : ${WP_SUBDOMAINS:-no}
-: ${WP_URL:?WP_URL is required}
+: ${WP_URL:? is required}
+: ${WP_TITLE:? is required}
+: ${WP_ADMIN_USER:? is required}
+: ${WP_ADMIN_PASSWORD:? is required}
+: ${WP_ADMIN_EMAIL:? is required}
 
 function install_core {
 	# Download the lastest WP, preferebly with the selected locale, but fall back to the default locale.
@@ -19,12 +23,12 @@ function install_core {
 	# Setup the database if required.
 	local SQL="CREATE DATABASE IF NOT EXISTS $WP_DB_NAME; CREATE USER '$WP_DB_USER' IDENTIFIED BY '$WP_DB_PASSWORD'; GRANT ALL PRIVILEGES ON $WP_DB_NAME.* TO '$WP_DB_USER';	FLUSH PRIVILEGES; SHOW GRANTS FOR \"$WP_DB_USER\""
 	echo Waiting for the server at $WP_DB_HOST
-	while ! mysql $V -h$WP_DB_HOST -P$WP_DB_PORT -uroot -p$MYSQL_ROOT_PASSWORD -e "SELECT VERSION();"; do sleep 5; done
+	while ! mysql $V -h$WP_DB_HOST -P$WP_DB_PORT -u$WP_DB_ROOT_USER -p$WP_DB_ROOT_PASSWORD -e "SELECT VERSION();"; do sleep 5; done
 	echo Checking the DB $WP_DB_NAME and USER $WP_DB_USER is available.
 	if ! mysql $V -h$WP_DB_HOST -P$WP_DB_PORT -u$WP_DB_USER -p$WP_DB_PASSWORD $WP_DB_NAME -e "SELECT DATABASE(), USER();"
 	then
 		echo Set up the DB $WP_DB_NAME and USER $WP_DB_USER.
-		while ! mysql $V -h$WP_DB_HOST -P$WP_DB_PORT -uroot -p$MYSQL_ROOT_PASSWORD -e "$SQL"; do sleep 5; done
+		while ! mysql $V -h$WP_DB_HOST -P$WP_DB_PORT -u$WP_DB_ROOT_USER -p$WP_DB_ROOT_PASSWORD -e "$SQL"; do sleep 5; done
 	fi
 
 	# Configure the database
@@ -52,8 +56,6 @@ function install_core {
 # Allows execution of arbitrary WP-CLI commands.
 # I suppose this is either quite dangerous and makes most of
 # the rest of this script redundant.
-# Use this carefully as it, rather xargs, will process quotes.
-# If you command contains quotes they shall not pass! Without escaping that is.
 function wp_commands {
 	for V in ${!WP_COMMANDS*}
 	do