From: Michal Migurski <migurski@fb.com>
Date: Wed, 6 Jan 2021 20:32:42 +0000 (-0800)
Subject: Added /home/osm/traces and /home/osm/images to persistent Docker-compose volumes
X-Git-Tag: live~1730^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4fac47a214d4f0ab2228cdb3b0f646f11d41b4ef

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

diff --git a/Dockerfile b/Dockerfile
index 701f8dfcc..33812d25d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,3 @@ RUN gem install bundler \
 # 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 2da3dbcb4..1111ad010 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,12 @@ services:
       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/tmp/
+      # Mount these upload directories so they persist between runs
+      - web-traces:/home/osm/traces
+      - web-images:/home/osm/images
     ports:
       - "3000:3000"
     environment:
@@ -29,7 +31,10 @@ services:
       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:
+  web-traces:
+  web-images:
   db-data: