pub-solar/infra-vintage
5
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Merge pull request 'Update mastodon to v4.1.0' (#3) from mastodon/update-4.1.0 into main

Browse source 
Reviewed-on: pub-solar/infra#3
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
b12f 2023-02-24 20:49:27 +01:00
parent 9731b69cbb 6e14bc910c
commit 61d7d6070a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mastodon/.envrc Normal file
View file

@ -0,0 +1,3 @@
source_up
ttp set cgn-1-pub_solar

15
mastodon/docker-compose.yml
View file

@ -57,9 +57,10 @@ services:
@cache_control {
path_regexp ^/(emoji|packs|/system/accounts/avatars|/system/media_attachments/files)
}
log {
output stderr
}
# Uncomment only for debugging, we don't log by default
#log {
# output stderr
#}
handle /.well-known/keybase.txt {
root * /srv
file_server
@ -134,7 +135,7 @@ services:
# - triton.cns.services=mastodon-redis
web:
image: tootsuite/mastodon:v4.0.2
image: tootsuite/mastodon:v4.1.0
mem_limit: 1g
restart: always
env_file: .env.production
@ -147,7 +148,7 @@ services:
- triton.cns.services=mastodon-web
streaming:
image: tootsuite/mastodon:v4.0.2
image: tootsuite/mastodon:v4.1.0
mem_limit: 1g
restart: always
env_file: .env.production
@ -160,7 +161,7 @@ services:
- triton.cns.services=mastodon-streaming
sidekiq:
image: tootsuite/mastodon:v4.0.2
image: tootsuite/mastodon:v4.1.0
mem_limit: 1g
restart: always
env_file: .env.production
@ -170,7 +171,7 @@ services:
- triton.cns.services=mastodon-sidekiq
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.9
mem_limit: 512m
restart: always
environment: