Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change all :delegated mounts to :cached mounts to preserve existing behavior of mounts #204

Merged
merged 2 commits into from
Aug 2, 2020
Merged

Change all :delegated mounts to :cached mounts to preserve existing behavior of mounts #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
131c89e
Change all :delegated mounts to :cached mounts to preserve existing b…
davidalger Aug 2, 2020
18914d1
Updated CL for PR #204
davidalger Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions environments/includes/blackfire.base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion environments/includes/nginx.base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:-''}
4 changes: 2 additions & 2 deletions environments/includes/php-fpm.base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion environments/magento1/magento1.blackfire.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/magento1/magento1.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/magento2/magento2.blackfire.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/magento2/magento2.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/magento2/magento2.magepack.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion environments/shopware/shopware.darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down