diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
commit | efc9ffcb80b995ef8c8d95ab1d8cb0af8efc094d (patch) | |
tree | 6ce57e5980ba0279355f97893d21852caace0232 /docker-compose.yml | |
parent | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (diff) | |
parent | 718802a05dfb3211d758513daf6070ffa22751dd (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index aaa3a4478..55b419e98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,17 @@ services: # volumes: # - ./redis:/data +# es: +# restart: always +# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3 +# environment: +# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" +# networks: +# - internal_network +#### Uncomment to enable ES persistance +## volumes: +## - ./elasticsearch:/usr/share/elasticsearch/data + web: build: . image: gargron/mastodon @@ -33,6 +44,7 @@ services: depends_on: - db - redis +# - es volumes: - ./public/assets:/mastodon/public/assets - ./public/packs:/mastodon/public/packs |