diff --git a/docker-compose.yml b/docker-compose.yml index 514d39f..0747fc7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -92,9 +92,9 @@ services: image: git.solarpunk.moe/solarpunk/mastodon:latest restart: always env_file: .env.production - command: bundle exec sidekiq -c 4 -q mailers -q scheduler + command: bundle exec sidekiq -c 2 -q mailers -q scheduler environment: - - DB_POOL=4 + - DB_POOL=2 depends_on: - db - redis @@ -104,17 +104,17 @@ services: - mail volumes: - ./public/system:/mastodon/public/system - healthcheck: - test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] + # healthcheck: + # test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] sidekiq-ingress-pull-push-default: build: . image: git.solarpunk.moe/solarpunk/mastodon:latest restart: always env_file: .env.production - command: bundle exec sidekiq -c 25 -q ingress -q pull -q push -q default + command: bundle exec sidekiq -c 5 -q ingress -q pull -q push -q default environment: - - DB_POOL=4 + - DB_POOL=5 depends_on: - db - redis @@ -124,17 +124,17 @@ services: - mail volumes: - ./public/system:/mastodon/public/system - healthcheck: - test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] + # healthcheck: + # test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] sidekiq-default-push-pull: build: . image: git.solarpunk.moe/solarpunk/mastodon:latest restart: always env_file: .env.production - command: bundle exec sidekiq -c 25 -q default -q ingress -q push -q pull + command: bundle exec sidekiq -c 3 -q default -q ingress -q push -q pull environment: - - DB_POOL=25 + - DB_POOL=3 depends_on: - db - redis @@ -144,17 +144,17 @@ services: - mail volumes: - ./public/system:/mastodon/public/system - healthcheck: - test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] + #healthcheck: + # test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] sidekiq-pull-push-default: build: . image: git.solarpunk.moe/solarpunk/mastodon:latest restart: always env_file: .env.production - command: bundle exec sidekiq -c 25 -q pull -q push -q default -q ingress + command: bundle exec sidekiq -c 5 -q pull -q push -q default -q ingress environment: - - DB_POOL=25 + - DB_POOL=5 depends_on: - db - redis @@ -164,8 +164,8 @@ services: - mail volumes: - ./public/system:/mastodon/public/system - healthcheck: - test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] + #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