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

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index dbdd62731b89cb44b90d082705ee2d4255a1be9f..90cf4ddf67e93bb63ee3c0105b3b0e0a09880495 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,19 @@
-version: "3"
-
 services:
   web:
     build:
       context: .
+    environment:
+      PIDFILE: /tmp/pids/server.pid
     volumes:
       - .:/app
+      # 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
+    tmpfs:
+      /tmp/pids/
     ports:
       - "3000:3000"
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
@@ -22,4 +30,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: