Merge branch 'main' of git.solarpunk.moe:Solarpunk/mastodon into main

docker-compose.yml

@@ -17,7 +17,7 @@ services:
 
   redis:
     restart: always
-    image: redis:6-alpine
+    image: redis:7-alpine
     networks:
       - internal_network
     healthcheck:
@@ -25,30 +25,31 @@ services:
     volumes:
       - ./redis:/data
 
-  es:
+        #es:
-    restart: always
+        #  restart: always
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+        #  image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
-    environment:
+        #  environment:
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+        #    - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - "cluster.name=es-mastodon"
+        #    - "cluster.name=es-mastodon"
-      - "discovery.type=single-node"
+        #    - "discovery.type=single-node"
-      - "bootstrap.memory_lock=true"
+        #    - "bootstrap.memory_lock=true"
-      - "cluster.routing.allocation.disk.watermark.low=0.9"
+        #    - "cluster.routing.allocation.disk.watermark.low=0.95"
-      - "cluster.routing.allocation.disk.watermark.high=0.94"
+        #    - "cluster.routing.allocation.disk.watermark.high=0.97"
-    networks:
+        #    - "cluster.routing.allocation.disk.watermark.flood_stage=0.98"
-      - internal_network
+        #  networks:
-    healthcheck:
+        #    - internal_network
-       test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+        #  healthcheck:
-    volumes:
+        #     test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-      - elasticsearch:/usr/share/elasticsearch/data
+        #  volumes:
-    ulimits:
+        #    - elasticsearch:/usr/share/elasticsearch/data
-      memlock:
+        #  ulimits:
-        soft: -1
+        #    memlock:
-        hard: -1
+        #      soft: -1
+        #      hard: -1
 
   web:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon
+    image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
     restart: always
     env_file: .env.production
     environment:
@@ -78,10 +79,12 @@ services:
       # - es
     volumes:
       - ./public/system:/mastodon/public/system
-
+    
   streaming:
-    build: .
+    build: 
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+      dockerfile: ./streaming/Dockerfile
+      context: .
+    image: git.solarpunk.moe/solarpunk/mastodon-streaming:v4.2.5
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -105,10 +108,10 @@ services:
     depends_on:
       - db
       - redis
-  
+
   sidekiq-mailers:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 2 -q mailers -q scheduler
@@ -126,7 +129,7 @@ services:
 
   sidekiq-ingress-pull-push-default:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 5 -q ingress -q pull -q push -q default
@@ -139,12 +142,13 @@ services:
       - external_network
       - internal_network
       - mail
+      - httpsproxy
     volumes:
       - ./public/system:/mastodon/public/system
 
   sidekiq-default-push-pull:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 3 -q default -q ingress -q push -q pull
@@ -157,12 +161,13 @@ services:
       - external_network
       - internal_network
       - mail
+      - httpsproxy
     volumes:
       - ./public/system:/mastodon/public/system
 
   sidekiq-pull-push-default:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:v4.2.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 8 -q pull -q push -q default -q ingress
@@ -175,6 +180,7 @@ services:
       - external_network
       - internal_network
       - mail
+      - httpsproxy
     volumes:
       - ./public/system:/mastodon/public/system