From 131c89ea3557992f29a3cefa1b72693681e6c621 Mon Sep 17 00:00:00 2001 From: David Alger Date: Sun, 2 Aug 2020 15:19:17 -0500 Subject: [PATCH 1/2] Change all :delegated mounts to :cached mounts to preserve existing behavior of mounts Reference https://docs.docker.com/docker-for-mac/mutagen/, docker/for-mac#1592. docker/for-mac#4590 for details. As of Docker Desktop Edge 2.3.2.0 the :delegated flag on a shared volume will automatically enable synchronization (via Mutagen) dramatically changing the expected and natural behavior of currently delegated mounts. Warden is currently using delegated mounts to specifically mount into containers things which should not be synced via Mutagen too avoid a performance penalty (large quantities of media files) and as a default for mount on Mac OS systems for better default performance characteristics where Mutagen syncs are not implemented. --- environments/includes/blackfire.base.yml | 4 ++-- environments/includes/nginx.base.yml | 2 +- environments/includes/php-fpm.base.yml | 4 ++-- environments/magento1/magento1.blackfire.darwin.yml | 2 +- environments/magento1/magento1.darwin.yml | 2 +- environments/magento2/magento2.blackfire.darwin.yml | 2 +- environments/magento2/magento2.darwin.yml | 2 +- environments/magento2/magento2.magepack.darwin.yml | 2 +- environments/shopware/shopware.darwin.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml index 09c7f952..8d1ed280 100644 --- 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 index f998f9d4..13715ec8 100644 --- 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 index 0d7c4738..c12f7b70 100644 --- 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 index 9f45fa75..3fb11856 100644 --- 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 index 538103c7..fad699ca 100644 --- 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 index a1299d44..902a5e17 100644 --- 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 index cd27b41c..618da21d 100644 --- 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 index f18c0187..ed79c526 100644 --- 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 index f1039fdf..162769d7 100644 --- 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 From 18914d17637a060086b4f1da51ee7f8c7146779c Mon Sep 17 00:00:00 2001 From: David Alger Date: Sun, 2 Aug 2020 17:16:38 -0500 Subject: [PATCH 2/2] Updated CL for PR #204 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e37078..cc3b7312 100644 --- 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)