improved docker-sync reliability on MacOS (#2264)

shopsys · Mar 15, 2021 · b9801f7 · b9801f7
1 parent 5cf451c
commit b9801f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/docker/conf/docker-compose-mac.yml.dist b/docker/conf/docker-compose-mac.yml.dist
@@ -1,4 +1,5 @@
 version: "3.4"
+
 services:
     postgres:
         image: postgres:12.1-alpine
@@ -22,7 +23,7 @@ services:
         depends_on:
             - php-fpm
         volumes:
-            - shopsys-framework-web-sync:/var/www/html/web
+            - ./web:/var/www/html/web:cached
             - ./docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:delegated
         ports:
             - "8000:8080"
@@ -38,8 +39,8 @@ services:
         container_name: shopsys-framework-php-fpm
         volumes:
             - shopsys-framework-sync:/var/www/html
-            - shopsys-framework-vendor-sync:/var/www/html/vendor
-            - shopsys-framework-web-sync:/var/www/html/web
+            - ./web:/var/www/html/web:cached
+            - ./.git/:/var/www/html/.git:delegated
         ports:
             - "35729:35729"
 
@@ -101,9 +102,3 @@ services:
 volumes:
     shopsys-framework-sync:
         external: true
-
-    shopsys-framework-vendor-sync:
-        external: true
-
-    shopsys-framework-web-sync:
-        external: true
diff --git a/docker/conf/docker-sync.yml.dist b/docker/conf/docker-sync.yml.dist
@@ -4,28 +4,13 @@ syncs:
         sync_userid: 501
         src: './'
         sync_excludes:
-            - docker/
             - .git
             - .idea
             - .docker-sync
             - .DS_Store
-            - docker
-            - kubernetes
-            - nbproject
             - node_modules
             - var/cache
-            - var/postgres-data
             - var/elasticsearch-data
+            - var/postgres-data
             - web
-            - vendor
         host_disk_mount_mode: 'delegated'
-
-    shopsys-framework-web-sync:
-        sync_userid: 501
-        src: './web'
-        host_disk_mount_mode: 'cached'
-
-    shopsys-framework-vendor-sync:
-        sync_userid: 501
-        src: './vendor'
-        host_disk_mount_mode: 'cached'