diff --git a/tools/build/docker/docker-compose.yml b/tools/build/docker/docker-compose.yml index 2fbf95f05..9658bf466 100644 --- a/tools/build/docker/docker-compose.yml +++ b/tools/build/docker/docker-compose.yml @@ -15,7 +15,7 @@ services: - lrr redis: - image: "docker.io/redis:7" + image: "docker.io/valkey/valkey:7" volumes: - redis_data:/data networks: diff --git a/tools/build/docker/install-everything.sh b/tools/build/docker/install-everything.sh index 2bf0922f0..06cf5d855 100755 --- a/tools/build/docker/install-everything.sh +++ b/tools/build/docker/install-everything.sh @@ -24,7 +24,7 @@ done #Just do everything apk update apk add tzdata -apk add redis libarchive-dev libbz2 openssl-dev zlib-dev linux-headers +apk add valkey libarchive-dev libbz2 openssl-dev zlib-dev linux-headers apk add imagemagick libwebp-tools libheif apk add g++ make pkgconf gnupg wget curl file apk add shadow s6 s6-portable-utils ghostscript diff --git a/tools/build/docker/s6/s6-rc.d/redis/run b/tools/build/docker/s6/s6-rc.d/redis/run index 881f385f0..f112f6419 100644 --- a/tools/build/docker/s6/s6-rc.d/redis/run +++ b/tools/build/docker/s6/s6-rc.d/redis/run @@ -1,2 +1,2 @@ #!/bin/sh -exec s6-setuidgid koyomi /usr/bin/redis-server /home/koyomi/lanraragi/tools/build/docker/redis.conf +exec s6-setuidgid koyomi /usr/bin/valkey-server /home/koyomi/lanraragi/tools/build/docker/redis.conf diff --git a/tools/install.pl b/tools/install.pl index db850487e..1e8e851d2 100755 --- a/tools/install.pl +++ b/tools/install.pl @@ -104,10 +104,10 @@ #Fails on win even if redis is in the path if (IS_UNIX) { - #Check for Redis - say("Checking for Redis..."); - can_run('redis-server') - or die 'NOT FOUND! Please install a Redis server before proceeding.'; + #Check for Redis/Valkey + say("Checking for Redis/Valkey..."); + can_run('valkey-server') || can_run('redis-server') + or die 'NOT FOUND! Please install a Redis/Valkey server before proceeding.'; say("OK!"); }