From: Tom Hughes <tom@compton.nu>
Date: Sun, 30 Apr 2023 17:43:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4013'
X-Git-Tag: live~1459
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/930d534c6c6d67436b3a8b6101c8e0d4fb7e389c?hp=9990724469c20401de3c4bffcb5f051509717e0b

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

diff --git a/docker-compose.yml b/docker-compose.yml
index ad55e660e..cf70b4ff2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ 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
@@ -12,6 +14,8 @@ services:
       - 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'