Added /home/osm/traces and /home/osm/images to persistent Docker-compose volumes

diff --git a/Dockerfile b/Dockerfile
index 701f8dfccc6b062afe37ffff6ee10969dcfb2aaf..33812d25d6d22a70308ec64eb5803b7ead6d367a 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,3 @@ RUN gem install bundler \
 # Install NodeJS packages
 ADD package.json yarn.lock /app/
 RUN yarnpkg install
 # Install NodeJS packages
 ADD package.json yarn.lock /app/
 RUN yarnpkg install

-
-# Create directories for traces and images
-RUN mkdir -pv /home/osm/traces /home/osm/images

diff --git a/docker-compose.yml b/docker-compose.yml
index 2da3dbcb42ad9c90946e9ccb28d7565b09419148..1111ad010df35d32bf0337bc7cf3f54bf2f1e95f 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,12 @@ services:
       context: .
     volumes:
       - .:/app
       context: .
     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/

+      - /app/tmp/
+      # Mount these upload directories so they persist between runs
+      - web-traces:/home/osm/traces
+      - web-images:/home/osm/images

     ports:
       - "3000:3000"
     environment:
     ports:
       - "3000:3000"
     environment:


@@ -29,7 +31,10 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: openstreetmap
     volumes:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: openstreetmap
     volumes:

+      # Mount the Postgres data directory so it persists between runs

       - db-data:/var/lib/postgresql/data
 
 volumes:
       - db-data:/var/lib/postgresql/data
 
 volumes:

+  web-traces:
+  web-images:

   db-data:
   db-data: