From: Aaron Brady <aaron.brady@shopify.com>
Date: Thu, 9 Aug 2018 20:37:48 +0000 (-0400)
Subject: Update docker-compose to cope with build-time assets (#8156)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8c279b1648fc0a07b5c5d4a0e18526bcb51c7700;p=mastodon.git

Update docker-compose to cope with build-time assets (#8156)

#7780 means that asset compilation happens as a build step.

Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
---

diff --git a/docker-compose.yml b/docker-compose.yml
index c54c73e44..3b50f6d31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,8 +46,6 @@ services:
       - redis
 #      - es
     volumes:
-      - ./public/assets:/mastodon/public/assets
-      - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
 
   streaming:
@@ -78,7 +76,6 @@ services:
       - external_network
       - internal_network
     volumes:
-      - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
 ## Uncomment to enable federation with tor instances along with adding the following ENV variables
 ## http_proxy=http://privoxy:8118