Revert "テストにkeydbを使うように"

This reverts commit 191284b.

.devcontainer/docker-compose.yml

@@ -15,15 +15,15 @@ services:
       - internal_network
       - external_network
 
-  keydb:
+  redis:
     restart: unless-stopped
-    image: eqalpha/keydb:latest
+    image: redis:7-alpine
     networks:
       - internal_network
     volumes:
-      - keydb-data:/data
+      - redis-data:/data
     healthcheck:
-      test: "keydb-cli ping"
+      test: "redis-cli ping"
       interval: 5s
       retries: 20
 
@@ -45,7 +45,7 @@ services:
 
 volumes:
   postgres-data:
-  keydb-data:
+  redis-data:
 
 networks:
   internal_network:

.github/workflows/test-backend.yml

@@ -23,8 +23,8 @@ jobs:
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
-      keydb:
-        image: eqalpha/keydb:latest
+      redis:
+        image: redis:7
         ports:
           - 56312:6379
 

.github/workflows/test-frontend.yml

@@ -62,8 +62,8 @@ jobs:
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
-      keydb:
-        image: eqalpha/keydb:latest
+      redis:
+        image: redis:7
         ports:
           - 56312:6379
 

.gitignore

@@ -37,7 +37,6 @@ coverage
 !/.config/docker_example.env
 docker-compose.yml
 !/.devcontainer/docker-compose.yml
-!/packages/backend/test/docker-compose.yml
 
 # misskey
 /build

docker-compose.yml.example

@@ -6,12 +6,12 @@ services:
     restart: always
     links:
       - db
-      - keydb
+      - redis
 #     - meilisearch
     depends_on:
       db:
         condition: service_healthy
-      keydb:
+      redis:
         condition: service_healthy
     ports:
       - "3000:3000"
@@ -22,15 +22,15 @@ services:
       - ./files:/misskey/files
       - ./.config:/misskey/.config:ro
 
-  keydb:
+  redis:
     restart: always
-    image: eqalpha/keydb:latest
+    image: redis:7-alpine
     networks:
       - internal_network
     volumes:
-      - ./keydb:/data
+      - ./redis:/data
     healthcheck:
-      test: "keydb-cli ping"
+      test: "redis-cli ping"
       interval: 5s
       retries: 20
 

packages/backend/test/docker-compose.yml

@@ -1,8 +1,8 @@
 version: "3"
 
 services:
-  keydbtest:
-    image: eqalpha/keydb:latest
+  redistest:
+    image: redis:7
     ports:
       - "127.0.0.1:56312:6379"