Merge branch 'develop'

Dockerfile

@@ -172,13 +172,13 @@ RUN gem install bundler
 # Home directory for bundle installs
 ENV BUNDLE_PATH .bundler
 
-ENV COMPOSER_VERSION=1.4.2 \
-	DRUSH_VERSION=8.1.11 \
-	DRUPAL_CONSOLE_VERSION=1.0.0-rc20 \
+ENV COMPOSER_VERSION=1.5.2 \
+	DRUSH_VERSION=8.1.13 \
+	DRUPAL_CONSOLE_VERSION=1.0.2 \
 	MHSENDMAIL_VERSION=0.2.0 \
-	WPCLI_VERSION=1.1.0 \
+	WPCLI_VERSION=1.3.0 \
 	MG_CODEGEN_VERSION=1.6.4 \
-	BLACKFIRE_VERSION=1.12.0
+	BLACKFIRE_VERSION=1.14.1
 RUN \
     # Composer
     curl -sSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer && \
@@ -211,8 +211,8 @@ RUN git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR
     ln -s $HOME/.zprezto/runcoms/zshrc $HOME/.zshrc
 
 # Install nvm and a default node version
-ENV NVM_VERSION=0.33.2 \
-	NODE_VERSION=6.10.3 \
+ENV NVM_VERSION=0.33.4 \
+	NODE_VERSION=6.11.3 \
 	NVM_DIR=$HOME/.nvm
 RUN \
     curl -sSL https://raw.githubusercontent.com/creationix/nvm/v${NVM_VERSION}/install.sh | bash && \
@@ -262,7 +262,10 @@ ENV \
 	# Set TERM so text editors/etc. can be used
 	TERM=xterm \
 	# Allow PROJECT_ROOT to be universally used in fin custom commands (inside and outside cli)
-	PROJECT_ROOT=/var/www
+	PROJECT_ROOT=/var/www \
+	# Default values for HOST_UID and HOST_GUI to match the default Ubuntu user. These are used in startup.sh
+	HOST_UID=1000 \
+	HOST_GID=1000
 
 USER root