Adding marketing site override capaibility using .env file to enable local debugging

mikedikan · mikedikan · commit 2d26d928ef9f · 2017-05-03T12:33:25.000-04:00
diff --git a/.env.example b/.env.example
@@ -0,0 +1,5 @@
+# Change the value to the IP address of your machine/browser to enable debugging.
+XDEBUG_IP_ADDRESS=127.0.0.1
+# Provides local environment overrides if used.  See docker.settings.private.php.example for details
+DRUPAL_EXTRA_SETTINGS=/var/www/html/sites/default/docker.settings.private.php
+
diff --git a/.gitignore b/.gitignore
@@ -92,4 +92,8 @@ ENV/
 .idea/
 
 .dev/
+
+# Docker
 .docker-sync/
+.env
+
diff --git a/docker-compose-marketing-site.yml b/docker-compose-marketing-site.yml
@@ -16,9 +16,15 @@ services:
       - DB_NAME=edxmktg
       - DB_PASSWORD=password
       - DB_USER=edxmktg001
-      - DRUPAL_EXTRA_SETTINGS=/var/www/html/sites/default/docker.settings.php
       - LMS_HOST=http://localhost:18000
       - MEMCACHE_HOST=edx.devstack.memcached
+      # Used by PhpStorm to attach the debug connection
+      - PHP_IDE_CONFIG=serverName=edx.docker
+      # For the settings below, see .env.example to provide values (default is after the ':-')
+      # Provides local environment overrides.  (PRIVATE_SETTINGS set in .env file)
+      - DRUPAL_EXTRA_SETTINGS=${DRUPAL_EXTRA_SETTINGS:-/var/www/html/sites/default/docker.settings.php}
+      # IP address of your machine to enable debugging (IP_ADDRESS set in .env file)
+      - XDEBUG_CONFIG=remote_host=${XDEBUG_IP_ADDRESS:-127.0.0.1}
     image: edxops/edx-mktg:latest
     ports:
       - "8080:80"
