use compose file version 3

blauerberg · blauerberg · commit 113cc56ecec7 · 2017-09-21T17:18:26.000+09:00
diff --git a/large/docker-compose.override.yml b/large/docker-compose.override.yml
@@ -2,17 +2,9 @@
 # The setting is for the development environment.
 # @see https://docs.docker.com/compose/extends/
 
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: busybox
-    volumes:
-      # put your drupal source code and mount as volume.
-      - ./volumes/drupal:/var/www/html
-    # take care that container_name must be unique in the docker engine.
-    #container_name: drupal_datastore
-
   db:
     volumes:
       # override mysql config if necessary.
@@ -32,12 +24,9 @@ services:
     #container_name: drupal_db
 
   php:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # allocate large memory_limit for drush.
       - ./php/php/php.ini:/usr/local/etc/php/php.ini
       # override php-fpm config to use xdebug with port 9000.
@@ -49,12 +38,9 @@ services:
     #container_name: drupal_php
 
   web:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # override nginx config to execute drupal through the php container.
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
@@ -66,7 +52,3 @@ services:
     ports:
       - "8025:8025"
     #container_name: drupal_mailhog
-
-#volumes:
-#  drupal_source:
-#    external: true
diff --git a/large/docker-compose.production.yml b/large/docker-compose.production.yml
@@ -1,12 +1,6 @@
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: drupal_datastore_prod
-    build: .
-    volumes:
-      - /var/www/html
-
   db:
     image: drupal_db_prod
     build: ./mysql
@@ -19,13 +13,13 @@ services:
   php:
     image: drupal_php_prod
     build: ./php
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
 
   web:
     image: drupal_web_prod
     build: ./nginx
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
     ports:
       - "80:80"
diff --git a/large/docker-compose.yml b/large/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   db:
diff --git a/micro/docker-compose.override.yml b/micro/docker-compose.override.yml
@@ -2,17 +2,9 @@
 # The setting is for the development environment.
 # @see https://docs.docker.com/compose/extends/
 
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: busybox
-    volumes:
-      # put your drupal source code and mount as volume.
-      - ./volumes/drupal:/var/www/html
-    # take care that container_name must be unique in the docker engine.
-    #container_name: drupal_datastore
-
   db:
     volumes:
       # override mysql config if necessary.
@@ -32,12 +24,9 @@ services:
     #container_name: drupal_db
 
   php:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # allocate large memory_limit for drush.
       - ./php/php/php.ini:/usr/local/etc/php/php.ini
       # override php-fpm config to use xdebug with port 9000.
@@ -49,12 +38,9 @@ services:
     #container_name: drupal_php
 
   web:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # override nginx config to execute drupal through the php container.
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
@@ -66,7 +52,3 @@ services:
     ports:
       - "8025:8025"
     #container_name: drupal_mailhog
-
-#volumes:
-#  drupal_source:
-#    external: true
diff --git a/micro/docker-compose.production.yml b/micro/docker-compose.production.yml
@@ -1,12 +1,6 @@
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: drupal_datastore_prod
-    build: .
-    volumes:
-      - /var/www/html
-
   db:
     image: drupal_db_prod
     build: ./mysql
@@ -19,13 +13,13 @@ services:
   php:
     image: drupal_php_prod
     build: ./php
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
 
   web:
     image: drupal_web_prod
     build: ./nginx
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
     ports:
       - "80:80"
diff --git a/micro/docker-compose.yml b/micro/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   db:
diff --git a/small/docker-compose.override.yml b/small/docker-compose.override.yml
@@ -2,17 +2,9 @@
 # The setting is for the development environment.
 # @see https://docs.docker.com/compose/extends/
 
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: busybox
-    volumes:
-      # put your drupal source code and mount as volume.
-      - ./volumes/drupal:/var/www/html
-    # take care that container_name must be unique in the docker engine.
-    #container_name: drupal_datastore
-
   db:
     volumes:
       # override mysql config if necessary.
@@ -32,12 +24,9 @@ services:
     #container_name: drupal_db
 
   php:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # allocate large memory_limit for drush.
       - ./php/php/php.ini:/usr/local/etc/php/php.ini
       # override php-fpm config to use xdebug with port 9000.
@@ -49,12 +38,9 @@ services:
     #container_name: drupal_php
 
   web:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # override nginx config to execute drupal through the php container.
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
@@ -66,7 +52,3 @@ services:
     ports:
       - "8025:8025"
     #container_name: drupal_mailhog
-
-#volumes:
-#  drupal_source:
-#    external: true
diff --git a/small/docker-compose.production.yml b/small/docker-compose.production.yml
@@ -1,12 +1,6 @@
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: drupal_datastore_prod
-    build: .
-    volumes:
-      - /var/www/html
-
   db:
     image: drupal_db_prod
     build: ./mysql
@@ -19,13 +13,13 @@ services:
   php:
     image: drupal_php_prod
     build: ./php
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
 
   web:
     image: drupal_web_prod
     build: ./nginx
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
     ports:
       - "80:80"
diff --git a/small/docker-compose.yml b/small/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   db:
diff --git a/xlarge/docker-compose.override.yml b/xlarge/docker-compose.override.yml
@@ -2,17 +2,9 @@
 # The setting is for the development environment.
 # @see https://docs.docker.com/compose/extends/
 
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: busybox
-    volumes:
-      # put your drupal source code and mount as volume.
-      - ./volumes/drupal:/var/www/html
-    # take care that container_name must be unique in the docker engine.
-    #container_name: drupal_datastore
-
   db:
     volumes:
       # override mysql config if necessary.
@@ -32,12 +24,9 @@ services:
     #container_name: drupal_db
 
   php:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # allocate large memory_limit for drush.
       - ./php/php/php.ini:/usr/local/etc/php/php.ini
       # override php-fpm config to use xdebug with port 9000.
@@ -49,12 +38,9 @@ services:
     #container_name: drupal_php
 
   web:
-    volumes_from:
-      - datastore
     volumes:
-      # Replace volume to this to use docker-sync for mac OS users to resolve performance issue.
-      # See also: https://github.com/docker/for-mac/issues/77
-      # - drupal_source:/var/www/html:rw
+      # put your drupal source code and mount as volume.
+      - ./volumes/drupal:/var/www/html:cached
       # override nginx config to execute drupal through the php container.
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
@@ -66,7 +52,3 @@ services:
     ports:
       - "8025:8025"
     #container_name: drupal_mailhog
-
-#volumes:
-#  drupal_source:
-#    external: true
diff --git a/xlarge/docker-compose.production.yml b/xlarge/docker-compose.production.yml
@@ -1,12 +1,6 @@
-version: '2'
+version: '3'
 
 services:
-  datastore:
-    image: drupal_datastore_prod
-    build: .
-    volumes:
-      - /var/www/html
-
   db:
     image: drupal_db_prod
     build: ./mysql
@@ -19,13 +13,13 @@ services:
   php:
     image: drupal_php_prod
     build: ./php
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
 
   web:
     image: drupal_web_prod
     build: ./nginx
-    volumes_from:
-      - datastore
+    volumes:
+      - ./volumes/drupal:/var/www/html:cached
     ports:
       - "80:80"
diff --git a/xlarge/docker-compose.yml b/xlarge/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   db:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: '2'`
	`1`	`+version: '3'`
`2`	`2`
`3`	`3`	`services:`
`4`	`4`	`db:`