Using v3 of Compose file structure

Use newer Docker Compose build on CircleCI

Author: gegere

.circleci/config.yml

@@ -6,7 +6,13 @@ jobs:
 
     steps:
       - checkout
-
+      - run:
+          name: Install Docker Compose
+          command: |
+            set -x
+            curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            chmod +x ~/docker-compose
+            sudo mv ~/docker-compose /usr/local/bin/docker-compose
       - run:
           name: Build Apache Docker image
           command: |
@@ -25,7 +31,6 @@ jobs:
             docker ps -a
             sleep 10
 
-
       - run: mkdir -p ~/apache/logs/container-build
 
       - run:
@@ -37,7 +42,7 @@ jobs:
           name: Global Environment Vars
           command: |
             docker exec apache_web_1 /bin/bash -c "export"
-            
+
       - run:
           name: DEV Build Tests
           command: |

.editorconfig

@@ -14,6 +14,7 @@ trim_trailing_whitespace = false
 
 [*.yml]
 indent_style = space
+indent_size = 2
 
 [Makefile]
 indent_style = tab

.env.example

@@ -1,3 +1,5 @@
 SASL_USER=p08tf1X
 SASL_PASS=p@ssw0Rd
 SMTP_HOST=email-test.htmlgraphic.com
+VOLUMES=/Volumes/Case/SITES/docker:/data
+#VOLUMES=/c/Users/southpark/docker:/data

docker-compose.local.yml

@@ -1,29 +1,29 @@
-web:
-  image: 'htmlgraphic/apache:envoyer'
-  volumes:
-   - "/Volumes/Case/SITES/docker:/data"
-   #- "/c/Users/southpark/docker:/data"
-  links:
-    - "db:mysql"
-  ports:
-    - "80:80"
-    - "443:443"
-  environment:
-    - NODE_ENVIRONMENT=dev
-  env_file:
-    - .env
-db:
-  image: 'htmlgraphic/mysql:5.7.18'
-  volumes_from:
-    - db-data
-  ports:
-    - "3306:3306"
-  environment:
-    - MYSQL_ROOT_PASSWORD=new_passwordac
-    - MYSQL_DATABASE=htmlgraphic
-    - MYSQL_USER=admin
-    - MYSQL_PASSWORD=new_password
-db-data:
-  image: 'busybox:latest'
-  volumes:
-    - "/var/lib/mysql"
+version: "3"
+services:
+  web:
+    image: 'htmlgraphic/apache:envoyer'
+    volumes:
+      - "/Volumes/Case/SITES/docker:/data" # <- Change to preferred local working dir
+     #- "/c/Users/southpark/docker:/data"
+    links:
+      - "db:mysql"
+    ports:
+      - "80:80"
+      - "443:443"
+    environment:
+      - NODE_ENVIRONMENT=dev
+    env_file:
+      - .env
+  db:
+    image: 'htmlgraphic/mysql:5.7.18'
+    volumes:
+      - "db-data:/var/lib/mysql"
+    ports:
+      - "3306:3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=new_passwordac
+      - MYSQL_DATABASE=htmlgraphic
+      - MYSQL_USER=admin
+      - MYSQL_PASSWORD=new_password
+volumes:
+  db-data: