Merge remote-tracking branch 'upstream/pull/3821'

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 9719f0e7bbc9735a58c5bfdf07d500ecb616e6bb..8f67212eb72b96a17bcd311cde735805f7b01510 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/
+      - /app/tmp/
+      # Mount these upload directories so they persist between runs
+      - web-traces:/home/osm/traces
+      - web-images:/home/osm/images
     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-traces:
+  web-images:
+  db-data: