SUpport for multisite, fixes #3

Author: nickbreen

docker-compose.yml

@@ -25,34 +25,23 @@ setup:
   volumes_from:
     - wp
   environment:
+    WP_LOCALE: en_NZ
+    WP_VERSION: 4.4.2
     WP_TITLE: Main
     WP_SUBDOMAINS: "yes"
     WP_URL: http://main.dev
     WP_ADMIN_USER: admin
     WP_ADMIN_PASSWORD: admin
-    WP_ADMIN_EMAIL: webmaster+admin@foobar.net.nz
+    WP_ADMIN_EMAIL: admin@main.dev
     WP_EXTRA_PHP: |
       define('DISABLE_WP_CRON', TRUE);
-      @define('COOKIE_DOMAIN', $$_SERVER[ 'HTTP_HOST' ]);
+    WP_COMMANDS_0: |
+      wp --url=http://main.dev theme activate twentyfifteen
     WP_COMMANDS_1: |
-      set -x
-      ID=$$(wp site list --fields=blog_id --domain=site1.dev | sed 1d)
-      if [ ! $$ID ]
-      then
-        ID=$$(wp site create --slug=site1 --title="Site 1" --porcelain)
-        wp db query "UPDATE wp_blogs SET domain = 'site1.dev' WHERE blog_id = $$ID"
-      fi
-      wp --url=http://site1.dev option update siteurl http://site1.dev
-      wp --url=http://site1.dev option update home http://site1.dev
-      wp site list
+      new_site sitea sitea.dev http://sitea.dev "Site A"
+      wp --url=http://sitea.dev theme activate twentyfourteen
     WP_COMMANDS_2: |
-      set -x
-      ID=$$(wp site list --fields=blog_id --domain=site2.dev | sed 1d)
-      if [ ! $$ID ]
-      then
-        ID=$$(wp site create --slug=site2 --title="Site 2" --porcelain)
-        wp db query "UPDATE wp_blogs SET domain = 'site2.dev' WHERE blog_id = $$ID"
-      fi
-      wp --url=http://site2.dev option update siteurl http://site2.dev
-      wp --url=http://site2.dev option update home http://site2.dev
+      new_site siteb siteb.dev http://siteb.dev "Site B"
+      wp --url=http://sitea.dev theme activate twentythirteen
+    WP_COMMANDS_END: |
       wp site list

setup.sh

@@ -1,23 +1,8 @@
 #!/bin/bash
 
-# Juggle ENV VARS
-: ${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_SUBDOMAINS:-no}
-: ${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.
-	wp core download ${WP_LOCALE:+--locale="$WP_LOCALE"} || wp core download || true
+	wp core download ${WP_LOCALE:+--locale="$WP_LOCALE"} ${WP_VERSION:+--version="$WP_VERSION"} || wp core download || true
 
 	local V=$(shopt -qo xtrace && echo "-vvv")
 	# Setup the database if required.
@@ -31,6 +16,21 @@ function install_core {
 		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
 
+	if [ $WP_SUBDOMAINS ]
+	then
+		EXTRA_PHP=$(cat <<-EOF
+		if (isset(\$_SERVER['HTTP_HOST']))
+			define('COOKIE_DOMAIN', preg_replace('/^www/', '', \$_SERVER['HTTP_HOST']));
+		define('MULTISITE', true);
+		define('SUBDOMAIN_INSTALL', true);
+		define('DOMAIN_CURRENT_SITE', '${WP_URL##*//}');
+		define('PATH_CURRENT_SITE', '/');
+		define('SITE_ID_CURRENT_SITE', 1);
+		define('BLOG_ID_CURRENT_SITE', 1);
+		EOF
+		)
+	fi
+
 	# Configure the database
 	wp core config \
 			${WP_LOCALE:+--locale="$WP_LOCALE"} \
@@ -39,11 +39,11 @@ function install_core {
 			--dbpass="${WP_DB_PASSWORD}" \
 			--dbhost="${WP_DB_HOST}:${WP_DB_PORT}" \
 			${WP_DB_PREFIX:+--dbprefix="$WP_DB_PREFIX"} \
-			--extra-php <<< "${WP_EXTRA_PHP}" \
+			--extra-php <<< "${WP_EXTRA_PHP}${EXTRA_PHP}" \
 		|| true
 
 	# Configure the Blog
-	wp core is-installed || wp core ${WP_SUBDOMAINS:+multisite-}install \
+	wp --url="$WP_URL" core is-installed || wp core ${WP_SUBDOMAINS:+multisite-}install \
 			--url="$WP_URL" \
 			${WP_SUBDOMAINS:+--subdomains} \
 			--title="$WP_TITLE" \
@@ -53,13 +53,26 @@ function install_core {
 			--skip-email
 }
 
+# setup a new site
+function new_site {
+	local SLUG=$1 DOMAIN=$2 URL=$3 TITLE=$4 ID
+	ID=$(wp site list --field=blog_id --domain=$DOMAIN)
+	if [ ! $ID ]
+	then
+		ID=$(wp site create --slug=$SLUG --title="$TITLE" --porcelain)
+		wp db query "UPDATE wp_blogs SET domain = '$DOMAIN' WHERE blog_id = $ID"
+	fi
+	wp --url=$URL option update siteurl $URL
+	wp --url=$URL option update home $URL
+}
+
 # Allows execution of arbitrary WP-CLI commands.
 # I suppose this is either quite dangerous and makes most of
 # the rest of this script redundant.
 function wp_commands {
 	for V in ${!WP_COMMANDS*}
 	do
-		sh <<< "${!V}"
+		eval "${!V}"
 	done
 }
 
@@ -68,3 +81,18 @@ function setup {
 	install_core
 	wp_commands
 }
+
+# Juggle ENV VARS
+: ${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_SUBDOMAINS:-no}
+: ${WP_URL:? is required}
+: ${WP_TITLE:? is required}
+: ${WP_ADMIN_USER:? is required}
+: ${WP_ADMIN_PASSWORD:? is required}
+: ${WP_ADMIN_EMAIL:? is required}