From 18269263d97cce518460aa3eabcda4354a649e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 29 Oct 2023 01:42:40 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=83=86=E3=82=B9=E3=83=88=E3=81=ABk?=
 =?UTF-8?q?eydb=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E3=81=AB"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 191284b83f104028df917f5f02b0394167f4f54e.
---
 .devcontainer/docker-compose.yml         | 10 +++++-----
 .github/workflows/test-backend.yml       |  4 ++--
 .github/workflows/test-frontend.yml      |  4 ++--
 .gitignore                               |  1 -
 docker-compose.yml.example               | 12 ++++++------
 packages/backend/test/docker-compose.yml |  4 ++--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index ece9e8f113a8..2809cd2ca469 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.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:
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a8ca8f06bbdb..d7be15bd4f09 100644
--- a/.github/workflows/test-backend.yml
+++ b/.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
 
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 8625dd4dc940..4ea4ba462873 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.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
 
diff --git a/.gitignore b/.gitignore
index 14e8b7c7fab8..a66e527db059 100644
--- a/.gitignore
+++ b/.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
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index e4f8a7f16759..a0061c5c20b1 100644
--- a/docker-compose.yml.example
+++ b/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
 
diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/docker-compose.yml
index 823ce1d78770..da6c01dda168 100644
--- a/packages/backend/test/docker-compose.yml
+++ b/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"