diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-11 15:28:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 15:28:06 +0200 |
| commit | d787bcdeb1570e4d8d67f326dadaf321a6854e06 (patch) | |
| tree | fa23a187b16bf07635312a7791013aacfc2c4474 /docker-compose.yml | |
| parent | 03afc365d530e6d57754ae9dbbdbd0c56431ee02 (diff) | |
| parent | 7067b64de33f9cd491e97329df266fde5fb49e42 (diff) | |
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 3 |
1 files changed, 0 insertions, 3 deletions
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 |