From 7bd4ad19311b1442c6bc5686e991c8d2b1084464 Mon Sep 17 00:00:00 2001
From: iberdinsky <finnsky2010@gmail.com>
Date: Tue, 1 Aug 2017 12:10:30 +0600
Subject: [PATCH 1/3] MacOS shared folder config + cached option

---
 .env.default                                  |  1 +
 Makefile                                      |  2 +-
 README.md                                     |  6 +++
 .../docker-compose.override.yml.default_mac   | 44 +++++++++++++++++++
 src/docker/docker-compose.yml                 |  2 +-
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src/docker/docker-compose.override.yml.default_mac

diff --git a/.env.default b/.env.default
index e51dff56c..8f47ed806 100644
--- a/.env.default
+++ b/.env.default
@@ -6,3 +6,4 @@ SITE_NAME=Site name
 COMPOSER_REQUIRE=solarium/solarium:3.6.*
 PROJECT_INSTALL=
 PHP_VERSION=7.1
+SHARED_FOLDER=/dev/shm
diff --git a/Makefile b/Makefile
index c76243b23..f06573b63 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ endif
 
 build: clean
 	mkdir -p build
-	mkdir -p /dev/shm/${COMPOSE_PROJECT_NAME}_mysql
+	mkdir -p ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql
 
 install:
 	@echo "Updating containers..."
diff --git a/README.md b/README.md
index 6e8e935b0..c4497987f 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,12 @@ For Linux install <a href="https://docs.docker.com/compose/install/" target="_bl
 
 5\. Run `make`
 
+Additional steps for MacOS install: (https://docs.docker.com/docker-for-mac/osxfs-caching/)
+
+  2\.4\. Set SHARED_FOLDER variable to any writable absolute path instead of /dev/shm (PROJECT_PATH/sql for example)
+
+3\. Copy __docker-compose\.override\.yml\.default_mac__ to __docker-compose\.override\.yml__
+
 ## Usage
 
 * `make` - Install project.
diff --git a/src/docker/docker-compose.override.yml.default_mac b/src/docker/docker-compose.override.yml.default_mac
new file mode 100644
index 000000000..92ada4165
--- /dev/null
+++ b/src/docker/docker-compose.override.yml.default_mac
@@ -0,0 +1,44 @@
+version: "2"
+
+services:
+
+# Override base service.
+  php:
+    volumes:
+      - ../../build:/var/www/html:cached
+      - ../${PROFILE_NAME}:/var/www/html/profiles/${PROFILE_NAME}:cached
+      - ../modules:/var/www/html/modules/custom:cached
+      - ../themes:/var/www/html/themes/custom:cached
+      - "./90-mail.ini:/etc/php${PHP_VERSION}/conf.d/90-mail.ini:cached"
+      - ../../config/sync:/var/www/html/sync:cached
+# Uncomment next line if you need PHP XDebug.
+#    command: php-fpm7 -F -d zend_extension=xdebug.so
+
+#  adminer:
+#    image: dockette/adminer:mysql-php7
+#    container_name: "${COMPOSE_PROJECT_NAME}_adminer"
+#    links:
+#      - mysql:mysql
+#    depends_on:
+#      - mysql
+#    networks:
+#      - front
+
+  mailhog:
+    image: skilldlabs/mailhog
+    container_name: "${COMPOSE_PROJECT_NAME}_mail"
+    restart: always
+    networks:
+      - front
+
+  mysql:
+    volumes:
+      - ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:cached
+
+
+  nginx:
+    ports:
+      - "8086:80"
+# Mount local folder with ssl keys.
+#    volumes:
+#     - ./nginx/ssl:/etc/nginx/ssl:Z
diff --git a/src/docker/docker-compose.yml b/src/docker/docker-compose.yml
index 15f8ba140..93077da3c 100644
--- a/src/docker/docker-compose.yml
+++ b/src/docker/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     image: percona:5.7
     container_name: "${COMPOSE_PROJECT_NAME}_mysql"
     volumes:
-      - /dev/shm/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:Z
+      - ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:Z
     environment:
       MYSQL_DATABASE: d8
       MYSQL_USER: d8

From b637efadc672946b3e163911bb09b7ff5c582954 Mon Sep 17 00:00:00 2001
From: iberdinsky <iberdinsky@skilld.fr>
Date: Tue, 29 May 2018 10:14:36 +0600
Subject: [PATCH 2/3] movin docker-compose file.

---
 .../docker-compose.override.yml.default_mac   |  0
 src/docker/docker-compose.yml                 | 55 -------------------
 2 files changed, 55 deletions(-)
 rename {src/docker => docker}/docker-compose.override.yml.default_mac (100%)
 delete mode 100644 src/docker/docker-compose.yml

diff --git a/src/docker/docker-compose.override.yml.default_mac b/docker/docker-compose.override.yml.default_mac
similarity index 100%
rename from src/docker/docker-compose.override.yml.default_mac
rename to docker/docker-compose.override.yml.default_mac
diff --git a/src/docker/docker-compose.yml b/src/docker/docker-compose.yml
deleted file mode 100644
index 93077da3c..000000000
--- a/src/docker/docker-compose.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-version: "2"
-
-services:
-
-  php:
-    image: skilldlabs/${PHP_IMAGE} # Allowed: 7.0, 5.6.
-    container_name: "${COMPOSE_PROJECT_NAME}_php"
-    links:
-      - mysql:mysql
-    depends_on:
-      - mysql
-    volumes:
-      - ../../build:/var/www/html:z
-      - ../${PROFILE_NAME}:/var/www/html/profiles/${PROFILE_NAME}:z
-      - ../modules:/var/www/html/modules/custom:z
-      - ../themes:/var/www/html/themes/custom:z
-    restart: always
-    networks:
-      - front
-
-  nginx:
-    image: skilldlabs/nginx:1.10.1
-    container_name: "${COMPOSE_PROJECT_NAME}_web"
-    links:
-      - mysql:mysql
-      - php:php
-    depends_on:
-      - php
-    volumes_from:
-      - php
-    restart: always
-    networks:
-      - front
-
-  mysql:
-    image: percona:5.7
-    container_name: "${COMPOSE_PROJECT_NAME}_mysql"
-    volumes:
-      - ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:Z
-    environment:
-      MYSQL_DATABASE: d8
-      MYSQL_USER: d8
-      MYSQL_PASSWORD: d8
-      MYSQL_ROOT_PASSWORD: d8root
-    restart: always
-    networks:
-      - front
-
-networks:
-  front:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: "${IPRANGE}"

From e2e709aa19ecd669d8e3ec96facdfeff9f973c8e Mon Sep 17 00:00:00 2001
From: iberdinsky <iberdinsky@skilld.fr>
Date: Tue, 29 May 2018 10:35:03 +0600
Subject: [PATCH 3/3] changed data dir vriable name

---
 .env.default                                   | 3 +--
 Makefile                                       | 2 +-
 README.md                                      | 2 +-
 docker/docker-compose.override.yml.default_mac | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.env.default b/.env.default
index 1e0553217..ac2d72fab 100644
--- a/.env.default
+++ b/.env.default
@@ -10,5 +10,4 @@ PHP_VERSION=7
 IMAGE_PHP=skilldlabs/php:71-fpm
 IMAGE_FRONT=skilldlabs/frontend:zen
 DB_URL=sqlite:///dev/shm/d8.sqlite
-
-SHARED_FOLDER=/dev/shm
+MYSQL_DATA_DIR=/dev/shm
diff --git a/Makefile b/Makefile
index b3bf863f2..18f0ceec0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ $(error Project name can not be default, please edit ".env" and set COMPOSE_PROJ
 endif
 
 prepare:
-	mkdir -p ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql
+	mkdir -p ${MYSQL_DATA_DIR}/${COMPOSE_PROJECT_NAME}_mysql
 	make -s down
 	make -s up
 	$(call php-0, apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community git)
diff --git a/README.md b/README.md
index 398b9abee..86b68fb54 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ For Linux install <a href="https://docs.docker.com/compose/install/" target="_bl
 
 Additional steps for MacOS install: (https://docs.docker.com/docker-for-mac/osxfs-caching/)
 
-  2\.4\. Set SHARED_FOLDER variable to any writable absolute path instead of /dev/shm (PROJECT_PATH/sql for example)
+  2\.3\. Set MYSQL_DATA_DIR variable to any writable absolute path instead of /dev/shm (PROJECT_PATH/sql for example)
 
 3\. Copy __docker-compose\.override\.yml\.default_mac__ to __docker-compose\.override\.yml__
 
diff --git a/docker/docker-compose.override.yml.default_mac b/docker/docker-compose.override.yml.default_mac
index 92ada4165..4dca2fe14 100644
--- a/docker/docker-compose.override.yml.default_mac
+++ b/docker/docker-compose.override.yml.default_mac
@@ -33,7 +33,7 @@ services:
 
   mysql:
     volumes:
-      - ${SHARED_FOLDER}/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:cached
+      - ${MYSQL_DATA_DIR}/${COMPOSE_PROJECT_NAME}_mysql:/var/lib/mysql:cached
 
 
   nginx: