knoflook/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let the formatter have its way

Browse Source
This commit is contained in:
decentral1se 2021-05-27 22:10:40 +02:00
parent 8ea6d53c10
commit d0812a22fe
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
compose.yml
View File

@ -23,24 +23,24 @@ services:
volumes: volumes:
- redis:/data - redis:/data
# es: # es:
# restart: always # restart: always
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10 # image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
# environment: # environment:
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" # - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
# - "cluster.name=es-mastodon" # - "cluster.name=es-mastodon"
# - "discovery.type=single-node" # - "discovery.type=single-node"
# - "bootstrap.memory_lock=true" # - "bootstrap.memory_lock=true"
# networks: # networks:
# - internal_network # - internal_network
# healthcheck: # healthcheck:
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
# volumes: # volumes:
# - ./elasticsearch:/usr/share/elasticsearch/data # - ./elasticsearch:/usr/share/elasticsearch/data
# ulimits: # ulimits:
# memlock: # memlock:
# soft: -1 # soft: -1
# hard: -1 # hard: -1
web: web:
image: &image tootsuite/mastodon:v3.3.0 image: &image tootsuite/mastodon:v3.3.0
@ -49,7 +49,11 @@ services:
- proxy - proxy
- internal_network - internal_network
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"] test:
[
"CMD-SHELL",
"wget -q --spider --proxy=off localhost:3000/health || exit 1",
]
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -72,7 +76,7 @@ services:
depends_on: depends_on:
- db - db
- redis - redis
# - es # - es
volumes: &appVolume volumes: &appVolume
- app:/mastodon - app:/mastodon
# secrets: &secrets # secrets: &secrets
@ -170,7 +174,11 @@ services:
command: node ./streaming command: node ./streaming
networks: *bothNetworks networks: *bothNetworks
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"] test:
[
"CMD-SHELL",
"wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1",
]
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure