update mastodon compose, fix helperbot to snapshot only single dfdb instance

helperbot

@@ -332,10 +332,8 @@ function system_backup {
         # database
         postgres_backup postgres-db-1 misskey sharkey $backup_working_directory
         # dragonflydb
-        redis_snapshot sharkey-dragonfly-1 6379
-        redis_snapshot sharkey-dragonfly-queue-1 6380
-        redis_snapshot sharkey-dragonfly-tl-1 6381
-        cp -r $backup_local_folder/sharkey/dragonfly $backup_working_directory/sharkey/dragonfly
+        redis_snapshot sharkey-dfdb-1 6379
+        cp -r $backup_local_folder/sharkey/dfdb $backup_working_directory/sharkey/dfdb
         # configs, extra
         cp $backup_local_folder/sharkey/compose.yaml $backup_working_directory/sharkey
         cp $backup_local_folder/sharkey/default.yml $backup_working_directory/sharkey
@@ -362,8 +360,6 @@ function system_backup {
         postgres_backup postgres-db-1 mastodon mastodon $backup_working_directory
         # dragonflydb
         redis_snapshot mastodon-dragonfly-1 6379
-        redis_snapshot mastodon-dragonfly-cache-1 6380
-        redis_snapshot mastodon-dragonfly-sidekiq-1 6381
         cp -r $backup_local_folder/mastodon/dragonfly $backup_working_directory/mastodon/dragonfly
         # configs, extra
         cp $backup_local_folder/mastodon/compose.yaml $backup_working_directory/mastodon

phosphorus/srv/docker/mastodon/compose.yaml

@@ -1,12 +1,13 @@
 services:
   web:
     # we use our own synth-soc fork
-    image: ghcr.io/melontini/mastodon:nightly
+    image: ghcr.io/synth-download/mastodon:nightly
     restart: always
     env_file:
       - .env.secrets
       - .env
     command: bundle exec puma -C config/puma.rb
+    #command: rails db:migrate
     networks:
       - masto
       - ip6net
@@ -20,10 +21,11 @@ services:
         condition: service_healthy
     volumes:
       - ./public/system:/mastodon/public/system
+      - ./init/disable_ssl.rb:/mastodon/config/initializers/disable_ssl.rb:ro
       - ./shared:/shared # this is just to allow seeing/copying emoji exports
 
   streaming:
-    image: ghcr.io/melontini/mastodon-streaming:nightly
+    image: ghcr.io/synth-download/mastodon-streaming:nightly
     restart: always
     env_file:
       - .env.secrets
@@ -42,7 +44,7 @@ services:
         condition: service_healthy
 
   ingress:
-    image: ghcr.io/melontini/mastodon-ingress:nightly
+    image: ghcr.io/synth-download/mastodon-ingress:nightly
     restart: always
     env_file:
       - .env.secrets
@@ -55,7 +57,7 @@ services:
         condition: service_healthy
 
   sidekiq:
-    image: ghcr.io/melontini/mastodon:nightly
+    image: ghcr.io/synth-download/mastodon:nightly
     restart: always
     env_file:
       - .env.secrets
@@ -90,53 +92,7 @@ services:
       DFLY_df_snapshot_format: false
       DFLY_dir: '/data'
     volumes:
-      - ./dragonfly/generic:/data
-    healthcheck:
-      test: "redis-cli ping"
-      interval: 5s
-      retries: 20
-
-  # cache dragonfly instance
-  dragonfly-cache:
-    image: docker.dragonflydb.io/dragonflydb/dragonfly
-    restart: always
-    ulimits:
-      memlock: -1
-    networks:
-      - masto
-    environment:
-      DFLY_port: 6380
-      DFLY_snapshot_cron: '* * * * *'
-      DFLY_version_check: false
-      DFLY_default_lua_flags: allow-undeclared-keys
-      DFLY_dbfilename: 'dump.rdb'
-      DFLY_df_snapshot_format: false
-      DFLY_dir: '/data'
-    volumes:
-      - ./dragonfly/cache:/data
-    healthcheck:
-      test: "redis-cli ping"
-      interval: 5s
-      retries: 20
-
-  # sidekiq dragonfly instance
-  dragonfly-sidekiq:
-    image: docker.dragonflydb.io/dragonflydb/dragonfly
-    restart: always
-    ulimits:
-      memlock: -1
-    networks:
-      - masto
-    environment:
-      DFLY_port: 6381
-      DFLY_snapshot_cron: '* * * * *'
-      DFLY_version_check: false
-      DFLY_default_lua_flags: allow-undeclared-keys
-      DFLY_dbfilename: 'dump.rdb'
-      DFLY_df_snapshot_format: false
-      DFLY_dir: '/data'
-    volumes:
-      - ./dragonfly/sidekiq:/data
+      - ./dragonfly:/data
     healthcheck:
       test: "redis-cli ping"
       interval: 5s