feat(professional-mastodon-instance): bump to v4.3.0

100terres · Oct 9, 2024 · 549f966 · 549f966
1 parent 9ae86b5
commit 549f966
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/services/professional-mastodon-instance/.env.sample b/services/professional-mastodon-instance/.env.sample
@@ -32,6 +32,14 @@ DB_NAME=professional_mastodon_instance
 DB_PASS=
 DB_PORT=5432
 
+# Active record encryption
+# ------------------------
+# docker compose run --rm professional-mastodon-instance-web bin/rails db:encryption:init
+# ------------------------
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=
+
 # Elasticsearch (optional)
 # ------------------------
 ES_ENABLED=true

diff --git a/services/professional-mastodon-instance/docker-compose.yml b/services/professional-mastodon-instance/docker-compose.yml
@@ -1,12 +1,15 @@
 services:
   professional-mastodon-instance-web:
-    image: tootsuite/mastodon:v4.2.12
+    image: ghcr.io/mastodon/mastodon:v4.3.0
     container_name: professional-mastodon-instance-web
     restart: always
     env_file: .env
-    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
+    command: bundle exec puma -C config/puma.rb
+    depends_on:
+      - professional-mastodon-instance-postgres
+      - professional-mastodon-instance-redis
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"]
+      test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1"]
     expose:
       - "3000"
     labels:
@@ -19,13 +22,16 @@ services:
       - ./data/public/system:/mastodon/public/system
 
   professional-mastodon-instance-streaming:
-    image: tootsuite/mastodon:v4.2.12
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0
     container_name: professional-mastodon-instance-streaming
     restart: always
     env_file: .env
-    command: node ./streaming
+    command: node ./streaming/index.js
+    depends_on:
+      - professional-mastodon-instance-postgres
+      - professional-mastodon-instance-redis
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"]
+      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1"]
     expose:
       - "4000"
     labels:
@@ -36,11 +42,16 @@ services:
       - "traefik.http.routers.professional-mastodon-instance-streaming.tls.certresolver=letsencrypt"
 
   professional-mastodon-instance-sidekiq:
-    image: tootsuite/mastodon:v4.2.12
+    image: ghcr.io/mastodon/mastodon:v4.3.0
     container_name: professional-mastodon-instance-sidekiq
     restart: always
     env_file: .env
     command: bundle exec sidekiq
+    depends_on:
+      - professional-mastodon-instance-postgres
+      - professional-mastodon-instance-redis
+    healthcheck:
+      test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
     volumes:
       - ./data/public/system:/mastodon/public/system