Update

compose/docker-compose-2.sample.yml

@@ -8,10 +8,10 @@ services:
   volumes:
    - ${WORKSPACE}:/home/vhosts
   logging:
-   driver: "json-file"
+   driver: 'json-file'
    options:
-    max-size: "1g"
-    max-file: "10"
+    max-size: '1g'
+    max-file: '10'
  # PHP 7.0 FPM
  fpm70:
   build: ./dockerfiles/php-fpm/7.0/debian-9
@@ -20,47 +20,53 @@ services:
   volumes:
    - ${WORKSPACE}:/home/vhosts
   logging:
-   driver: "json-file"
+   driver: 'json-file'
    options:
-    max-size: "1g"
-    max-file: "10"
+    max-size: '1g'
+    max-file: '10'
  # MailCatcher
  mailcatcher:
   build: ./dockerfiles/mailcatcher
   image: mailcatcher:0.6.5
   container_name: mailcatcher
+  ports:
+    - '1080:1080'
   logging:
-   driver: "json-file"
+   driver: 'json-file'
    options:
-    max-size: "1g"
-    max-file: "10"
+    max-size: '1g'
+    max-file: '10'
  # MariaDB
  db:
   build: ./dockerfiles/mariadb/10.2/official
   image: mariadb:10.2-official
   container_name: db
+  ports:
+   - '3306:3306'
   volumes:
-   - ${WORKSPACE}/database:/var/lib/mysql
+   - ${WORKSPACE}/container-data/db:/var/lib/mysql
   logging:
-   driver: "json-file"
+   driver: 'json-file'
    options:
-    max-size: "500m"
-    max-file: "9"
+    max-size: '500m'
+    max-file: '9'
   environment:
-   MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-   MARIADB_PASS: password
+   MYSQL_ROOT_PASSWORD: 'password'
  # Apache HTTPd
  httpd:
   build: ./dockerfiles/httpd/2.4/debian-9
   image: httpd:2.4-debian
   container_name: httpd
+  ports:
+   - '80:80'
   volumes:
+   - ${WORKSPACE}/container-data/httpd:/etc/apache2/sites-available
    - ${WORKSPACE}:/home/vhosts
   logging:
-   driver: "json-file"
+   driver: 'json-file'
    options:
-    max-size: "1g"
-    max-file: "10"
+    max-size: '1g'
+    max-file: '10'
 
 networks:
  default: