Merge pull request #3870 from Dimitar5555/patch-1

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 9719f0e7bbc9735a58c5bfdf07d500ecb616e6bb..ad55e660ec5f05130b4d4b9c0156efcb1dcb2674 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,13 +6,14 @@ services:
       context: .
     volumes:
       - .:/app
-      # don't mount tmp directory (https://github.com/Shopify/bootsnap/issues/177)
-      - /app/tmp
+      # Prevent these directories from mounting so they're not shared between host OS and Docker
+      - /app/node_modules/
+      # Mount a tmp directory that will persist between runs
+      - web-tmp:/app/tmp
+      # Mount a storage directory that will persist between runs
+      - web-storage:/app/storage
     ports:
       - "3000:3000"
-    environment:
-      # https://github.com/Shopify/bootsnap/issues/262
-      ENABLE_BOOTSNAP: 'false'
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     depends_on:
       - db
@@ -27,4 +28,10 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: openstreetmap
     volumes:
-      - ./docker-db-data:/var/lib/postgresql/data
+      # Mount the Postgres data directory so it persists between runs
+      - db-data:/var/lib/postgresql/data
+
+volumes:
+  web-tmp:
+  web-storage:
+  db-data: