Merge pull request 'Update mastodon to version 4.2.0' (#13) from bump-mastodon-4.2.0 into main

Reviewed-on: pub-solar/infra#13
Reviewed-by: b12f <hello@benjaminbaedorf.eu>

mastodon/README.md

@@ -60,6 +60,7 @@ docker cp --archive blue-mastodon_caddy_2:/data/caddy/certificates/acme-v02.api.
 docker cp --archive blue-mastodon_caddy_2:/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mastodon.pub.solar ./certificates/acme-v02.api.letsencrypt.org-directory/
 
 docker-compose --project-name blue-mastodon up \
+  --detach \
   --scale caddy=2 \
   --no-recreate \
   --no-start
@@ -79,8 +80,9 @@ Look for new releases on https://www.elastic.co/guide/en/elasticsearch/reference
 and edit the docker image tag accordingly.
 ```
 docker-compose --project-name blue-mastodon up \
+  --detach \
   --scale elasticsearch=2 \
-  --no-recreate \
+  --no-recreate
 
 # Stop old elasticsearch container
 docker stop blue-mastodon_elasticsearch_2

mastodon/docker-compose.yml

@@ -136,7 +136,7 @@ services:
 #      - triton.cns.services=mastodon-redis
 
   web:
-    image: tootsuite/mastodon:v4.1.4
+    image: tootsuite/mastodon:v4.2.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -149,7 +149,7 @@ services:
       - triton.cns.services=mastodon-web
 
   streaming:
-    image: tootsuite/mastodon:v4.1.4
+    image: tootsuite/mastodon:v4.2.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -162,7 +162,7 @@ services:
       - triton.cns.services=mastodon-streaming
 
   sidekiq:
-    image: tootsuite/mastodon:v4.1.4
+    image: tootsuite/mastodon:v4.2.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -172,7 +172,7 @@ services:
       - triton.cns.services=mastodon-sidekiq
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13
     mem_limit: 512m
     restart: always
     environment: