Prevent node_modules from mounting to save rake yarn:install step

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c7874db392b725c947341161fe1eb12f95260eae..c3b48d5612ea41ddc2f0b059e182405fd7e1db4a 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,7 +25,6 @@ jobs:
       run: |
         docker-compose run --rm web rake db:migrate
         docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
       run: |
         docker-compose run --rm web rake db:migrate
         docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no

-        docker-compose run web bundle exec rake yarn:install

     - name: Test Basic Website
       run: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'
     - name: Test Basic Website
       run: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'

diff --git a/DOCKER.md b/DOCKER.md
index e2c2d2129cae324cd72ae24d95d50d5d33d80838..d5a673bbeae4e496304fcb57fd1270de260ddb24 100644 (file)
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -58,12 +58,6 @@ Run the test suite by running:
 
     docker-compose run --rm web bundle exec rake test:db
 
 
     docker-compose run --rm web bundle exec rake test:db
 

-### Node Modules
-
-Install required front-end Node modules:
-
-    docker-compose run --rm web bundle exec rake yarn:install
-

 ### Loading an OSM extract
 
 This installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract. Here an example for loading an OSM extract into your Docker-based OSM instance.
 ### Loading an OSM extract
 
 This installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract. Here an example for loading an OSM extract into your Docker-based OSM instance.

diff --git a/docker-compose.yml b/docker-compose.yml
index 9719f0e7bbc9735a58c5bfdf07d500ecb616e6bb..f03d315c707184364538cce87b677ec05272bae1 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       - .:/app
       # don't mount tmp directory (https://github.com/Shopify/bootsnap/issues/177)
       - /app/tmp
       - .:/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
+      - /app/node_modules/

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