Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/build/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- lrr

redis:
image: "docker.io/redis:7"
image: "docker.io/valkey/valkey:7"
volumes:
- redis_data:/data
networks:
Expand Down
2 changes: 1 addition & 1 deletion tools/build/docker/install-everything.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/build/docker/s6/s6-rc.d/redis/run
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions tools/install.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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!");
}

Expand Down
Loading