From a0e711191e2b83ac1e602ac35606be17512cb0fa Mon Sep 17 00:00:00 2001
From: Ivan Gabaldon <git@inetol.net>
Date: Mon, 13 May 2024 15:39:28 +0200
Subject: [PATCH] Replace Redis with Valkey + reduce logging for containers
 caddy and redis (#230)

* replace redis w/valkey

* cleanup

* apply changes

* revert volume reuse

* fix valkey container

* revert remove `CAP_DROP` `CAP_ADD`

* revert switch from `redis` to `valkey`

* revert revert volume reuse

* update README

* apply changes

* add back useful stuff from README + keep structure + keep compat old docker compose

---------

Co-authored-by: Emilien Devos <4016501+unixfox@users.noreply.github.com>
---
 README.md           | 17 +++++++++++------
 docker-compose.yaml | 20 ++++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 3243208..e1200cc 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,17 @@
 # searxng-docker
 
-Create a new SearXNG  instance in five minutes using Docker
+Create a new SearXNG instance in five minutes using Docker
 
 ## What is included ?
 
 | Name | Description | Docker image | Dockerfile |
 | -- | -- | -- | -- |
-| [Caddy](https://github.com/caddyserver/caddy) | Reverse proxy (create a LetsEncrypt certificate automatically) | [caddy/caddy:2-alpine](https://hub.docker.com/_/caddy) | [Dockerfile](https://github.com/caddyserver/caddy-docker) |
-| [SearXNG](https://github.com/searxng/searxng) | SearXNG by itself | [searxng/searxng:latest](https://hub.docker.com/r/searxng/searxng) | [Dockerfile](https://github.com/searxng/searxng/blob/master/Dockerfile) |
-| [Redis](https://github.com/redis/redis) | In-memory database | [redis:alpine](https://hub.docker.com/_/redis) | [Dockerfile-alpine.template](https://github.com/docker-library/redis/blob/master/Dockerfile-alpine.template) |
+| [Caddy](https://github.com/caddyserver/caddy) | Reverse proxy (create a LetsEncrypt certificate automatically) | [docker.io/library/caddy:2-alpine](https://hub.docker.com/_/caddy)           | [Dockerfile](https://github.com/caddyserver/caddy-docker/blob/master/Dockerfile.tmpl) |
+| [SearXNG](https://github.com/searxng/searxng) | SearXNG by itself                                              | [docker.io/searxng/searxng:latest](https://hub.docker.com/r/searxng/searxng) | [Dockerfile](https://github.com/searxng/searxng/blob/master/Dockerfile)               |
+| [Valkey](https://github.com/valkey-io/valkey) | In-memory database                                             | [cgr.dev/chainguard/valkey:latest](https://cgr.dev/chainguard/valkey)        | [Valkey-image](https://github.com/chainguard-images/images/tree/main/images/valkey)             |
 
 ## How to use it
+
 - [Install docker](https://docs.docker.com/install/)
 - Get searxng-docker
   ```sh
@@ -31,12 +32,14 @@ Create a new SearXNG  instance in five minutes using Docker
 > [Install the docker-compose plugin](https://docs.docker.com/compose/install/#scenario-two-install-the-compose-plugin) (be sure that docker-compose version is at least 1.9.0)
 
 ## How to access the logs
+
 To access the logs from all the containers use: `docker compose logs -f`.
 
 To access the logs of one specific container:
+
 - Caddy: `docker compose logs -f caddy`
 - SearXNG: `docker compose logs -f searxng`
-- Redis: `docker compose logs -f redis`
+- Valkey: `docker compose logs -f redis`
 
 ### Start SearXNG with systemd
 
@@ -56,11 +59,12 @@ The SearXNG image proxy is activated by default.
 
 The default [Content-Security-Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy) allow the browser to access to ```${SEARXNG_HOSTNAME}``` and ```https://*.tile.openstreetmap.org;```.
 
-If some users wants to disable the image proxy, you have to modify [./Caddyfile](https://github.com/searxng/searxng-docker/blob/master/Caddyfile). Replace the ```img-src 'self' data: https://*.tile.openstreetmap.org;``` by ```img-src * data:;```.
+If some users want to disable the image proxy, you have to modify [./Caddyfile](https://github.com/searxng/searxng-docker/blob/master/Caddyfile). Replace the ```img-src 'self' data: https://*.tile.openstreetmap.org;``` by ```img-src * data:;```.
 
 ## Multi Architecture Docker images
 
 Supported architecture:
+
 - amd64
 - arm64
 - arm/v7
@@ -76,6 +80,7 @@ docker compose up -d
 ```
 
 Or the old way (with the old docker-compose version):
+
 ```sh
 git pull
 docker-compose pull
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 39524c7..c41b4af 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,21 +16,31 @@ services:
       - ALL
     cap_add:
       - NET_BIND_SERVICE
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
 
   redis:
     container_name: redis
-    image: docker.io/library/redis:alpine
-    command: redis-server --save 30 1 --loglevel warning
+    image: cgr.dev/chainguard/valkey:latest
+    command: --save 30 1 --loglevel warning
     networks:
       - searxng
     volumes:
-      - redis-data:/data
+      - valkey-data:/data
     cap_drop:
       - ALL
     cap_add:
       - SETGID
       - SETUID
       - DAC_OVERRIDE
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
 
   searxng:
     container_name: searxng
@@ -57,10 +67,8 @@ services:
 
 networks:
   searxng:
-    ipam:
-      driver: default
 
 volumes:
   caddy-data:
   caddy-config:
-  redis-data:
+  valkey-data: