Remove authorize_web call from traces api controller

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index f03d315c707184364538cce87b677ec05272bae1..cf70b4ff20f9e4d389c617e58bca3b339e07e98c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,17 +4,20 @@ services:
   web:
     build:
       context: .
   web:
     build:
       context: .

+    environment:
+      PIDFILE: /tmp/pids/server.pid

     volumes:
       - .:/app
     volumes:
       - .:/app

-      # don't mount tmp directory (https://github.com/Shopify/bootsnap/issues/177)
-      - /app/tmp
-      # Prevent node_modules from mounting so it's not shared between host OS and Docker
+      # Prevent these directories from mounting so they're not shared between host OS and Docker

       - /app/node_modules/
       - /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"
     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


@@ -29,4 +32,10 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: openstreetmap
     volumes:
       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: