[DEV] Split docker-compose file for different hosts

Author: vertexvaar

.gitignore

@@ -18,3 +18,4 @@ var
 /config/
 dynamicReturnTypeMeta.json
 /Documentation-GENERATED-temp/
+docker-compose.yml

docker-compose.yml renamed to .project/docker/docker-compose.darwin.yml

@@ -18,7 +18,7 @@ services:
 
   php:
     build:
-      context: ./.project/docker/php/
+      context: .project/docker/php/
       dockerfile: Dockerfile
     volumes:
       - ./:/app/:cached

.project/docker/docker-compose.unix.yml

@@ -0,0 +1,60 @@
+version: "3.7"
+
+services:
+  httpd:
+    image: in2code/httpd:2.4-alpine
+    environment:
+      WEB_DOCUMENT_ROOT: /app/${WEBROOT}/
+      VIRTUAL_HOST: ${HOST}
+      VIRTUAL_PORT: 443
+      VIRTUAL_PROTO: https
+    volumes:
+      - ./:/app/:cached
+    networks:
+      default:
+        aliases:
+          - ${HOST}
+
+  php:
+    image: in2code/php-dev:7.2-fpm
+    volumes:
+      - ./:/app/:cached
+      - $HOME/.composer/auth.json:/tmp/composer/auth.json
+      - $HOME/.composer/cache/:/tmp/composer/cache/
+    env_file:
+      - .env
+
+  mysql:
+    image: in2code/mysql:5.7
+    env_file:
+      - .env
+    volumes:
+      - mysql:/var/lib/mysql/
+      - ${SQLDUMPSDIR}:/${SQLDUMPSDIR}
+    ports:
+      - ${SQLPORT}:3306
+
+  node:
+    image: node:10
+    user: node
+    command: "npm run run-all"
+    volumes:
+      - ./:/home/node/app/
+    working_dir: /home/node/app/Resources/Private
+
+  chrome:
+    image: selenium/standalone-chrome-debug:3.141
+    volumes:
+      - /dev/shm:/dev/shm
+    ports:
+      - ${CHROMEPORT}:5900
+
+  mail:
+    image: mailhog/mailhog
+    environment:
+      VIRTUAL_PORT: 8025
+      VIRTUAL_HOST: ${MAIL}
+
+volumes:
+  typo3var:
+  mysql:

Makefile

@@ -31,8 +31,8 @@ stop:
 ## Removes all containers and volumes
 destroy: stop
 	echo "$(EMOJI_litter) Removing the project"
-	git clean -dfx
 	docker-compose down -v --remove-orphans
+	git clean -dfx
 
 ## Starts docker-compose up -d
 start:
@@ -82,6 +82,15 @@ create-certificate: install-mkcert
 	if [[ ! -f $(HOME)/.dinghy/certs/${HOST}.key ]]; then mkcert -cert-file $(HOME)/.dinghy/certs/${HOST}.crt -key-file $(HOME)/.dinghy/certs/${HOST}.key ${HOST}; fi;
 	if [[ ! -f $(HOME)/.dinghy/certs/${MAIL}.key ]]; then mkcert -cert-file $(HOME)/.dinghy/certs/${MAIL}.crt -key-file $(HOME)/.dinghy/certs/${MAIL}.key ${MAIL}; fi;
 
+## Choose the right docker-compose file for your environment
+link-compose-file:
+	echo "$(EMOJI_triangular_ruler) Linking the OS specific compose file"
+ifeq ($(shell uname -s), Darwin)
+	ln -snf .project/docker/docker-compose.darwin.yml docker-compose.yml
+else
+	ln -snf .project/docker/docker-compose.unix.yml docker-compose.yml
+endif
+
 ## Initialize the docker setup
 init-docker: create-dirs create-certificate
 	echo "$(EMOJI_rocket) Initializing docker environment"
@@ -116,7 +125,7 @@ typo3-install-autocomplete:
 	curl -sLO https://raw.githubusercontent.com/TYPO3/TYPO3.CMS/master/dynamicReturnTypeMeta.json
 
 ## To start an existing project incl. rsync from fileadmin, uploads and database dump
-install-project: destroy add-hosts-entry init-docker composer-install typo3-add-dockerconfig typo3-install-autocomplete typo3-setupinstall mysql-restore typo3-clearcache typo3-comparedb
+install-project: destroy link-compose-file add-hosts-entry init-docker composer-install typo3-add-dockerconfig typo3-install-autocomplete typo3-setupinstall mysql-restore typo3-clearcache typo3-comparedb
 	echo "---------------------"
 	echo ""
 	echo "The project is online $(EMOJI_thumbsup)"
@@ -208,3 +217,4 @@ EMOJI_helicopter := "🚁️"
 EMOJI_broom := "🧹"
 EMOJI_nutandbolt := "🔩"
 EMOJI_crystal_ball := "🔮"
+EMOJI_triangular_ruler := "📐"