|
@@ -1,6 +1,5 @@
|
|
|
version: '3'
|
|
|
services:
|
|
|
-
|
|
|
db:
|
|
|
restart: always
|
|
|
image: postgres:14-alpine
|
|
@@ -8,11 +7,11 @@ services:
|
|
|
networks:
|
|
|
- internal_network
|
|
|
healthcheck:
|
|
|
- test: ["CMD", "pg_isready", "-U", "postgres"]
|
|
|
+ test: ['CMD', 'pg_isready', '-U', 'postgres']
|
|
|
volumes:
|
|
|
- ./postgres14:/var/lib/postgresql/data
|
|
|
environment:
|
|
|
- - "POSTGRES_HOST_AUTH_METHOD=trust"
|
|
|
+ - 'POSTGRES_HOST_AUTH_METHOD=trust'
|
|
|
|
|
|
redis:
|
|
|
restart: always
|
|
@@ -20,28 +19,28 @@ services:
|
|
|
networks:
|
|
|
- internal_network
|
|
|
healthcheck:
|
|
|
- test: ["CMD", "redis-cli", "ping"]
|
|
|
+ test: ['CMD', 'redis-cli', 'ping']
|
|
|
volumes:
|
|
|
- ./redis:/data
|
|
|
|
|
|
-# es:
|
|
|
-# restart: always
|
|
|
-# image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
|
|
|
-# environment:
|
|
|
-# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
|
|
-# - "cluster.name=es-mastodon"
|
|
|
-# - "discovery.type=single-node"
|
|
|
-# - "bootstrap.memory_lock=true"
|
|
|
-# networks:
|
|
|
-# - internal_network
|
|
|
-# healthcheck:
|
|
|
-# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
|
|
-# volumes:
|
|
|
-# - ./elasticsearch:/usr/share/elasticsearch/data
|
|
|
-# ulimits:
|
|
|
-# memlock:
|
|
|
-# soft: -1
|
|
|
-# hard: -1
|
|
|
+ # es:
|
|
|
+ # restart: always
|
|
|
+ # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
|
|
|
+ # environment:
|
|
|
+ # - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
|
|
+ # - "cluster.name=es-mastodon"
|
|
|
+ # - "discovery.type=single-node"
|
|
|
+ # - "bootstrap.memory_lock=true"
|
|
|
+ # networks:
|
|
|
+ # - internal_network
|
|
|
+ # healthcheck:
|
|
|
+ # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
|
|
+ # volumes:
|
|
|
+ # - ./elasticsearch:/usr/share/elasticsearch/data
|
|
|
+ # ulimits:
|
|
|
+ # memlock:
|
|
|
+ # soft: -1
|
|
|
+ # hard: -1
|
|
|
|
|
|
web:
|
|
|
build: .
|
|
@@ -53,13 +52,14 @@ services:
|
|
|
- external_network
|
|
|
- internal_network
|
|
|
healthcheck:
|
|
|
- test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"]
|
|
|
+ # prettier-ignore
|
|
|
+ test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
|
|
|
ports:
|
|
|
- - "127.0.0.1:3000:3000"
|
|
|
+ - '127.0.0.1:3000:3000'
|
|
|
depends_on:
|
|
|
- db
|
|
|
- redis
|
|
|
-# - es
|
|
|
+ # - es
|
|
|
volumes:
|
|
|
- ./public/system:/mastodon/public/system
|
|
|
|
|
@@ -73,9 +73,10 @@ services:
|
|
|
- external_network
|
|
|
- internal_network
|
|
|
healthcheck:
|
|
|
- test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"]
|
|
|
+ # prettier-ignore
|
|
|
+ test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
|
|
|
ports:
|
|
|
- - "127.0.0.1:4000:4000"
|
|
|
+ - '127.0.0.1:4000:4000'
|
|
|
depends_on:
|
|
|
- db
|
|
|
- redis
|
|
@@ -95,24 +96,24 @@ services:
|
|
|
volumes:
|
|
|
- ./public/system:/mastodon/public/system
|
|
|
healthcheck:
|
|
|
- test: ["CMD-SHELL", "ps aux | grep '[s]idekiq\ 6' || false"]
|
|
|
+ test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
|
|
|
|
|
-## Uncomment to enable federation with tor instances along with adding the following ENV variables
|
|
|
-## http_proxy=http://privoxy:8118
|
|
|
-## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
|
|
|
-# tor:
|
|
|
-# image: sirboops/tor
|
|
|
-# networks:
|
|
|
-# - external_network
|
|
|
-# - internal_network
|
|
|
-#
|
|
|
-# privoxy:
|
|
|
-# image: sirboops/privoxy
|
|
|
-# volumes:
|
|
|
-# - ./priv-config:/opt/config
|
|
|
-# networks:
|
|
|
-# - external_network
|
|
|
-# - internal_network
|
|
|
+ ## Uncomment to enable federation with tor instances along with adding the following ENV variables
|
|
|
+ ## http_proxy=http://privoxy:8118
|
|
|
+ ## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
|
|
|
+ # tor:
|
|
|
+ # image: sirboops/tor
|
|
|
+ # networks:
|
|
|
+ # - external_network
|
|
|
+ # - internal_network
|
|
|
+ #
|
|
|
+ # privoxy:
|
|
|
+ # image: sirboops/privoxy
|
|
|
+ # volumes:
|
|
|
+ # - ./priv-config:/opt/config
|
|
|
+ # networks:
|
|
|
+ # - external_network
|
|
|
+ # - internal_network
|
|
|
|
|
|
networks:
|
|
|
external_network:
|