Don't show types twice in issue type select

[rails.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 70730febfca4f1a33322a335fcc794f49c7c7e10..cf70b4ff20f9e4d389c617e58bca3b339e07e98c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,18 @@ services:
   web:
     build:
       context: .
   web:
     build:
       context: .

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

     volumes:
       - .:/app
     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'
     ports:
       - "3000:3000"
     command: bundle exec rails s -p 3000 -b '0.0.0.0'


@@ -19,6 +29,13 @@ services:
     ports:
       - "54321:5432"
     environment:
     ports:
       - "54321:5432"
     environment:

+      POSTGRES_HOST_AUTH_METHOD: trust

       POSTGRES_DB: openstreetmap
     volumes:
       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: