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

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index dbdd62731b89cb44b90d082705ee2d4255a1be9f..8f67212eb72b96a17bcd311cde735805f7b01510 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,12 @@ services:
       context: .
     volumes:
       - .:/app
+      # 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"
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
@@ -22,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: