Merge pull request #204 from davidalger/delegated-to-cache-mounts-on-…

…darwin Change all :delegated mounts to :cached mounts to preserve existing behavior of mounts
wardenenv · Aug 2, 2020 · 09dbb6d · 09dbb6d
2 parents a3ed782 + 18914d1
commit 09dbb6d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
 [All Commits](https://github.com/davidalger/warden/compare/0.8.1..develop)
 
+**Enhancements:**
+
+* Changed all `:delegated` mounts to `:cached` mounts to preserve existing behavior of mounts when new behavior in Docker Desktop Edge 2.3.2.0 is promoted to stable channel ([#204](https://github.com/davidalger/warden/pull/204) by @davidalger)
 
 ## Version [0.8.1](https://github.com/davidalger/warden/tree/0.8.1) (2020-07-30)
 [All Commits](https://github.com/davidalger/warden/compare/0.8.0..0.8.1)

diff --git a/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml
@@ -2,8 +2,8 @@ version: "3.5"
 
 x-volumes: &volumes
   - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-  - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
-  - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
+  - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:cached
+  - .${WARDEN_WEB_ROOT:-}/:/var/www/html:cached
 
 x-extra_hosts: &extra_hosts
     - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}

diff --git a/environments/includes/nginx.base.yml b/environments/includes/nginx.base.yml
@@ -11,6 +11,6 @@ services:
           HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`) || Host(`${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-nginx.loadbalancer.server.port=80
     volumes:
-      - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
+      - .${WARDEN_WEB_ROOT:-}/:/var/www/html:cached
     environment:
       - XDEBUG_CONNECT_BACK_HOST=${XDEBUG_CONNECT_BACK_HOST:-''}
diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml
@@ -2,8 +2,8 @@ version: "3.5"
 
 x-volumes: &volumes
   - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-  - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
-  - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
+  - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:cached
+  - .${WARDEN_WEB_ROOT:-}/:/var/www/html:cached
 
 x-extra_hosts: &extra_hosts
     - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}

diff --git a/environments/magento1/magento1.blackfire.darwin.yml b/environments/magento1/magento1.blackfire.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/media:/var/www/html/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/media:/var/www/html/media:cached
   - appdata:/var/www/html
 
 x-environment: &environment

diff --git a/environments/magento1/magento1.darwin.yml b/environments/magento1/magento1.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/media:/var/www/html/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/media:/var/www/html/media:cached
   - appdata:/var/www/html
 
 x-environment: &environment

diff --git a/environments/magento2/magento2.blackfire.darwin.yml b/environments/magento2/magento2.blackfire.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
   - appdata:/var/www/html
 
 x-environment: &environment

diff --git a/environments/magento2/magento2.darwin.yml b/environments/magento2/magento2.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
   - appdata:/var/www/html
 
 x-environment: &environment

diff --git a/environments/magento2/magento2.magepack.darwin.yml b/environments/magento2/magento2.magepack.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
   - appdata:/var/www/html
 
 services:

diff --git a/environments/shopware/shopware.darwin.yml b/environments/shopware/shopware.darwin.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 
 x-volumes: &volumes
-  - .${WARDEN_WEB_ROOT:-}/public/media:/var/www/html/public/media:delegated
+  - .${WARDEN_WEB_ROOT:-}/public/media:/var/www/html/public/media:cached
   - appdata:/var/www/html
 
 x-environment: &environment