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

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 1111ad010df35d32bf0337bc7cf3f54bf2f1e95f..cf70b4ff20f9e4d389c617e58bca3b339e07e98c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,19 +4,20 @@ services:
   web:
     build:
       context: .
   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/
     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
+      # 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"
     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
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     depends_on:
       - db


@@ -35,6 +36,6 @@ services:
       - db-data:/var/lib/postgresql/data
 
 volumes:
       - db-data:/var/lib/postgresql/data
 
 volumes:

-  web-traces:
-  web-images:
+  web-tmp:
+  web-storage:

   db-data:
   db-data: