From f829a2ed9d09c143a2a55d33ef19b2d6a68ee99b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Wed, 14 Dec 2016 11:15:33 +0100
Subject: [PATCH] Preparing docker on OSX for d4m-nfs to improve FS performance

---
 docker-compose.yml | 28 ++++++++++++++--------------
 env-example        | 13 +++++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ce8d7d12..50dd475d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,20 +72,20 @@ services:
             # Custom scripts/binaries required for httpd server vhost
             # configuration to work.
             # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
-            - ./.devilbox/bin/${HTTPD_SERVER}:/opt/bin:ro
+            - ${DEVILBOX_PATH}/.devilbox/bin/${HTTPD_SERVER}:/opt/bin:ro
 
             # Mount user-defined httpd configuration files
             # @see environment::CUSTOM_HTTPD_CONF_DIR for how this
             # is added in httpd server
-            - ./.devilbox/etc/${HTTPD_SERVER}:/etc/${HTTPD_SERVER}:ro
+            - ${DEVILBOX_PATH}/.devilbox/etc/${HTTPD_SERVER}:/etc/${HTTPD_SERVER}:ro
 
             # Mount custom intranet
             # (configured in /etc/${HTTPD_SERVER}/01-vhost-default.conf)
-            - ./.devilbox/www:/var/www/default:ro
+            - ${DEVILBOX_PATH}/.devilbox/www:/var/www/default:ro
 
             # Mount user-defined httpd log
             # @see ./etc/${HTTPD_SERVER}/*.conf for log defines
-            - ./log/${HTTPD_SERVER}:/var/log/${HTTPD_SERVER}
+            - ${DEVILBOX_PATH}/log/${HTTPD_SERVER}:/var/log/${HTTPD_SERVER}
 
             # Mount custom mass virtual hosting
             # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
@@ -174,20 +174,20 @@ services:
 
             # Mount custom intranet
             # (configured in /etc/${HTTPD_SERVER}/01-vhost-default.conf)
-            - ./.devilbox/www:/var/www/default:ro
+            - ${DEVILBOX_PATH}/.devilbox/www:/var/www/default:ro
 
             # Mount logs
-            - ./log/${PHP_SERVER}:/var/log/php-fpm
+            - ${DEVILBOX_PATH}/log/${PHP_SERVER}:/var/log/php-fpm
 
             # Mount MySQL Socket directory
-            - ./run/mysql:/tmp/mysql
+            - ${DEVILBOX_PATH}/run/mysql:/tmp/mysql
 
             # Mount Mail directory
-            - ./run/mail:/var/mail
+            - ${DEVILBOX_PATH}/run/mail:/var/mail
 
             # Mount devilbox user-defined *.ini files in order
             # to overwrite the default PHP configuration
-            - ./cfg/${PHP_SERVER}:/etc/php-custom.d:ro
+            - ${DEVILBOX_PATH}/cfg/${PHP_SERVER}:/etc/php-custom.d:ro
 
 
             # Mount custom mass virtual hosting
@@ -242,14 +242,14 @@ services:
             # HOST-DIRECTORY : DOCKER-DIRECTORY
 
             # Mount logs
-            - ./log/${MYSQL_SERVER}:/var/log/mysql
+            - ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql
 
             # Mount MySQL Socket directory
-            - ./run/mysql:/tmp/mysql
+            - ${DEVILBOX_PATH}/run/mysql:/tmp/mysql
 
             # Mount devilbox user-defined cnf files in order
             # to overwrite the MySQL server configuration
-            - ./cfg/${MYSQL_SERVER}:/etc/mysql/conf.d:ro
+            - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/conf.d:ro
 
             # Mount MySQL Data directory
             - ${HOST_PATH_TO_MYSQL_DATADIR}:/var/lib/mysql
@@ -285,10 +285,10 @@ services:
             # HOST-DIRECTORY : DOCKER-DIRECTORY
 
             # Mount logs
-            - ./log/postgres-${POSTGRES_SERVER}:/var/log/postgresql
+            - ${DEVILBOX_PATH}/log/postgres-${POSTGRES_SERVER}:/var/log/postgresql
 
             # Mount PostgreSQL Socket directory
-            - ./run/postgres:/var/run/postgresql
+            - ${DEVILBOX_PATH}/run/postgres:/var/run/postgresql
 
             # Mount PostgreSQL Data directory
             - ${HOST_PATH_TO_POSTGRES_DATADIR}:/var/lib/postgresql/data/pgdata
diff --git a/env-example b/env-example
index 2a0b242c..3e0efc99 100644
--- a/env-example
+++ b/env-example
@@ -18,6 +18,19 @@
 DEBUG_COMPOSE_ENTRYPOINT=0
 
 
+
+###
+### Relative or absolute path to the devilbox repository.
+### (Used as a prefix for all mount paths)
+### There is no need to change this.
+###
+### The only exception is for OSX users wanting to use NFS
+### mounts instead of Filesystem mounts due to degraded performance
+### on OSX.
+###
+DEVILBOX_PATH=.
+
+
 ###
 ### At what IP address should the docker services listen
 ### on the Host computer?