diff options
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 52eea7a74..01fe320a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,18 +3,20 @@ services: db: restart: always - image: postgres:9.6-alpine + image: postgres:14-alpine shm_size: 256mb networks: - internal_network healthcheck: test: ["CMD", "pg_isready", "-U", "postgres"] volumes: - - ./postgres:/var/lib/postgresql/data + - ./postgres14:/var/lib/postgresql/data + environment: + - "POSTGRES_HOST_AUTH_METHOD=trust" redis: restart: always - image: redis:6.0-alpine + image: redis:6-alpine networks: - internal_network healthcheck: @@ -24,7 +26,7 @@ services: # es: # restart: always -# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10 +# image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2 # environment: # - "ES_JAVA_OPTS=-Xms512m -Xmx512m" # - "cluster.name=es-mastodon" @@ -92,6 +94,9 @@ services: - internal_network volumes: - ./public/system:/mastodon/public/system + healthcheck: + 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 |