Merge branch 'release/2.2.2'

Author: socketwench

.docker/apache/5.6/Dockerfile

@@ -119,7 +119,7 @@ RUN chmod a+x -R /docker-entrypoint-init.d
 COPY bashrc-root /root/.bashrc
 
 EXPOSE 80
-WORKDIR /var/www/html
+WORKDIR /var/www
 USER apache
 
 # Copy the user bashrc file.

.docker/apache/5.6/aliases.drushrc.php

@@ -5,11 +5,13 @@
  * Contains Drush site alias definitions.
  */
 
+$apache_docroot_dir = getenv('APACHE_DOCROOT_DIR');
+
 /**
  * Alias for the preview environment.
  */
 $aliases['docker'] = array (
-  'root' => '/var/www/html',
+  'root' => empty($apache_docroot_dir) ? '/var/www/html' : $apache_docroot_dir,
   'uri' => 'http://docker.test',
   'path-aliases' => array(
     '%files' => 'sites/default/files',

.docker/apache/5.6/bashrc-root

@@ -1 +1,4 @@
 PS1="\u@flight-deck-web:\w# "
+
+APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/html}"
+cd $APACHE_DOCROOT_DIR

.docker/apache/5.6/bashrc-user

@@ -1 +1,4 @@
 PS1="\u@flight-deck-web:\w\$ "
+
+APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/html}"
+cd $APACHE_DOCROOT_DIR

.docker/apache/5.6/drushrc.php

@@ -4,7 +4,10 @@
  *
  * Additional Drush startup customization.
  */
+
+$apache_docroot_dir = getenv('APACHE_DOCROOT_DIR');
+
 if (file_exists('/.dockerenv')) {
   $options['uri'] = 'http://docker.test';
-  $options['root'] = '/var/www/html';
+  $options['root'] = empty($apache_docroot_dir) ? '/var/www/html' : $apache_docroot_dir;
 }

.docker/apache/7.0/Dockerfile

@@ -138,7 +138,7 @@ RUN chmod a+x -R /docker-entrypoint-init.d
 COPY bashrc-root /root/.bashrc
 
 EXPOSE 80 443
-WORKDIR /var/www/html
+WORKDIR /var/www
 USER apache
 
 # Copy the user bashrc file.

.docker/apache/7.0/aliases.drushrc.php

@@ -5,11 +5,13 @@
  * Contains Drush site alias definitions.
  */
 
+$apache_docroot_dir = getenv('APACHE_DOCROOT_DIR');
+
 /**
  * Alias for the preview environment.
  */
 $aliases['docker'] = array (
-  'root' => '/var/www/html',
+  'root' => empty($apache_docroot_dir) ? '/var/www/html' : $apache_docroot_dir,
   'uri' => 'http://docker.test',
   'path-aliases' => array(
     '%files' => 'sites/default/files',

.docker/apache/7.0/bashrc-root

@@ -1 +1,4 @@
 PS1="\u@flight-deck-web:\w# "
+
+APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/html}"
+cd $APACHE_DOCROOT_DIR

.docker/apache/7.0/bashrc-user

@@ -1 +1,4 @@
 PS1="\u@flight-deck-web:\w\$ "
+
+APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/html}"
+cd $APACHE_DOCROOT_DIR

.docker/apache/7.0/drushrc.php

@@ -4,7 +4,10 @@
  *
  * Additional Drush startup customization.
  */
+
+$apache_docroot_dir = getenv('APACHE_DOCROOT_DIR');
+
 if (file_exists('/.dockerenv')) {
   $options['uri'] = 'http://docker.test';
-  $options['root'] = '/var/www/html';
+  $options['root'] = empty($apache_docroot_dir) ? '/var/www/html' : $apache_docroot_dir;
 }