Remove links

compose/docker-compose.example.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.3'
 services:
  # PHP 5.6 FPM
  fpm56:
@@ -6,10 +6,7 @@ services:
   image: php-fpm:5.6-debian
   container_name: fpm56
   volumes:
-   - /home/antadis/workspace:/home/vhosts
-  links:
-   - "db:db"
-   - "mailcatcher:mailcatcher"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options:
@@ -21,10 +18,7 @@ services:
   image: php-fpm:7.0-debian
   container_name: fpm70
   volumes:
-   - /home/antadis/workspace:/home/vhosts
-  links:
-   - "db:db"
-   - "mailcatcher:mailcatcher"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options:
@@ -47,7 +41,7 @@ services:
   container_name: db
   user: mysql
   volumes:
-   - /home/antadis/workspace/database:/var/lib/mysql
+   - ${WORKSPACE}/database:/var/lib/mysql
   logging:
    driver: "json-file"
    options:
@@ -61,10 +55,7 @@ services:
   image: httpd:2.4-debian
   container_name: httpd
   volumes:
-   - /home/antadis/workspace:/home/vhosts
-  links:
-   - "fpm56:fpm56"
-   - "fpm70:fpm70"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options:

docker-compose.yml

@@ -1,14 +1,12 @@
-version: '2.1'
+version: '2.3'
 services:
  # PHP 5.6 FPM
  fpm56:
-  container_name: fpm56
+  build: ./dockerfiles/php-fpm/5.6/debian-8
   image: php-fpm:5.6-debian
+  container_name: fpm56
   volumes:
-   - /home/michael/workspace:/home/vhosts
-  links:
-   - "db:db"
-   - "mailcatcher:mailcatcher"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options:
@@ -16,13 +14,11 @@ services:
     max-file: "10"
  # PHP 7.0 FPM
  fpm70:
-  container_name: fpm70
+  build: ./dockerfiles/php-fpm/7.0/debian-9
   image: php-fpm:7.0-debian
+  container_name: fpm70
   volumes:
-   - /home/michael/workspace:/home/vhosts
-  links:
-   - "db:db"
-   - "mailcatcher:mailcatcher"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options:
@@ -30,8 +26,9 @@ services:
     max-file: "10"
  # MailCatcher
  mailcatcher:
-  container_name: mailcatcher
+  build: ./dockerfiles/mailcatcher
   image: mailcatcher:0.6.5
+  container_name: mailcatcher
   logging:
    driver: "json-file"
    options:
@@ -39,11 +36,12 @@ services:
     max-file: "10"
  # MariaDB
  db:
-  container_name: db
+  build: ./dockerfiles/mariadb/10.2/debian
   image: mariadb:10.2-debian
+  container_name: db
   user: mysql
   volumes:
-   - /home/michael/workspace/database:/var/lib/mysql
+   - ${WORKSPACE}/database:/var/lib/mysql
   logging:
    driver: "json-file"
    options:
@@ -53,13 +51,11 @@ services:
    MARIADB_PASS: password
  # Apache HTTPd
  httpd:
-  container_name: httpd
+  build: ./dockerfiles/httpd/2.4/debian-9
   image: httpd:2.4-debian
+  container_name: httpd
   volumes:
-   - /home/michael/workspace:/home/vhosts
-  links:
-   - "fpm56:fpm56"
-   - "fpm70:fpm70"
+   - ${WORKSPACE}:/home/vhosts
   logging:
    driver: "json-file"
    options: