Fixed race condition caused by docker-compose starting two containers…

… with identical mounts simultaneously Resolves #110
wardenenv · Mar 25, 2020 · 56ce14a · 56ce14a
1 parent bfe7f26
commit 56ce14a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@
 **Bug Fixes:**
 
 * Fixed issue where `-` in `WARDEN_ENV_NAME` would results in `0.0.0.0` being used in `extra_hosts` passed to containers
-
+* Fixed race condition caused by docker-compose starting two containers with identical mounts simultaneously (issue [#110](https://github.com/davidalger/warden/issues/110))
 
 ## Version [0.3.1](https://github.com/davidalger/warden/tree/0.3.1) (2020-03-06)
 [All Commits](https://github.com/davidalger/warden/compare/0.3.0..0.3.1)

diff --git a/environments/laravel/laravel.base.yml b/environments/laravel/laravel.base.yml
@@ -55,7 +55,7 @@ services:
       - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
       - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
     depends_on:
-      - db
+      - php-fpm
     volumes:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated

diff --git a/environments/magento1/magento1.base.yml b/environments/magento1/magento1.base.yml
@@ -54,7 +54,7 @@ services:
       - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
       - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
     depends_on:
-      - db
+      - php-fpm
     volumes:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated

diff --git a/environments/magento1/magento1.blackfire.base.yml b/environments/magento1/magento1.blackfire.base.yml
@@ -4,7 +4,7 @@ services:
     hostname: "${WARDEN_ENV_NAME}-php-blackfire"
     image: quay.io/warden/php-fpm:${PHP_VERSION:-7.2}-magento1-blackfire
     depends_on:
-      - db
+      - php-fpm
     volumes:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated

diff --git a/environments/magento2/magento2.base.yml b/environments/magento2/magento2.base.yml
@@ -71,7 +71,7 @@ services:
       - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
       - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
     depends_on:
-      - db
+      - php-fpm
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"

diff --git a/environments/magento2/magento2.blackfire.base.yml b/environments/magento2/magento2.blackfire.base.yml
@@ -4,7 +4,7 @@ services:
     hostname: "${WARDEN_ENV_NAME}-php-blackfire"
     image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire
     depends_on:
-      - db
+      - php-fpm
 
   blackfire-agent:
     hostname: "${WARDEN_ENV_NAME}-blackfire-agent"