Update docker-compose
This commit is contained in:
parent
6b5e24993a
commit
2c72f8444a
|
@ -17,7 +17,7 @@ services:
|
|||
|
||||
redis:
|
||||
restart: always
|
||||
image: redis:6-alpine
|
||||
image: redis:7-alpine
|
||||
networks:
|
||||
- internal_network
|
||||
healthcheck:
|
||||
|
@ -25,30 +25,31 @@ services:
|
|||
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"
|
||||
- "cluster.routing.allocation.disk.watermark.low=0.9"
|
||||
- "cluster.routing.allocation.disk.watermark.high=0.94"
|
||||
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"
|
||||
# - "cluster.routing.allocation.disk.watermark.low=0.95"
|
||||
# - "cluster.routing.allocation.disk.watermark.high=0.97"
|
||||
# - "cluster.routing.allocation.disk.watermark.flood_stage=0.98"
|
||||
# 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: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
environment:
|
||||
|
@ -78,10 +79,12 @@ services:
|
|||
# - es
|
||||
volumes:
|
||||
- ./public/system:/mastodon/public/system
|
||||
|
||||
|
||||
streaming:
|
||||
build: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||
build:
|
||||
dockerfile: ./streaming/Dockerfile
|
||||
context: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon-streaming:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: node ./streaming
|
||||
|
@ -105,10 +108,10 @@ services:
|
|||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
|
||||
|
||||
sidekiq-mailers:
|
||||
build: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: bundle exec sidekiq -c 2 -q mailers -q scheduler
|
||||
|
@ -126,7 +129,7 @@ services:
|
|||
|
||||
sidekiq-ingress-pull-push-default:
|
||||
build: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: bundle exec sidekiq -c 5 -q ingress -q pull -q push -q default
|
||||
|
@ -139,12 +142,13 @@ services:
|
|||
- external_network
|
||||
- internal_network
|
||||
- mail
|
||||
- httpsproxy
|
||||
volumes:
|
||||
- ./public/system:/mastodon/public/system
|
||||
|
||||
sidekiq-default-push-pull:
|
||||
build: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: bundle exec sidekiq -c 3 -q default -q ingress -q push -q pull
|
||||
|
@ -157,12 +161,13 @@ services:
|
|||
- external_network
|
||||
- internal_network
|
||||
- mail
|
||||
- httpsproxy
|
||||
volumes:
|
||||
- ./public/system:/mastodon/public/system
|
||||
|
||||
sidekiq-pull-push-default:
|
||||
build: .
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||
image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: bundle exec sidekiq -c 8 -q pull -q push -q default -q ingress
|
||||
|
@ -175,6 +180,7 @@ services:
|
|||
- external_network
|
||||
- internal_network
|
||||
- mail
|
||||
- httpsproxy
|
||||
volumes:
|
||||
- ./public/system:/mastodon/public/system
|
||||
|
||||
|
|
Loading…
Reference in New Issue