Replace redis with valkey

wodby · May 6, 2024 · a05c4d1 · a05c4d1
1 parent 2da3f74
commit a05c4d1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.env b/.env
@@ -59,10 +59,9 @@ MARIADB_TAG=11.1-3.28.2
 #MARIADB_TAG=10.5-3.28.2
 #MARIADB_TAG=10.4-3.28.2
 
-### --- REDIS ---
+### --- VALKEY ---
 
-REDIS_TAG=7-4.4.2
-#REDIS_TAG=6-4.4.2
+VALKEY_TAG=7-0.1.0
 
 ### --- VARNISH ---
 

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The Ruby stack consist of the following containers:
 | [Ruby]          | 3.3, 3.2, 3.1, 3.0          | [wodby/ruby]                       | ✓             | ✓                  |
 | [Sidekiq]       |                             | [wodby/ruby]                       | ✓             |                    |
 | [PostgreSQL]    | 16, 15, 14, 13, 12          | [wodby/postgres]                   | ✓             | ✓                  |
-| [Redis]         | 7, 6                        | [wodby/redis]                      | ✓             | ✓                  |
+| [Valkey]        | 7                           | [wodby/valkey]                     | ✓             | ✓                  |
 | [MariaDB]       | 11, 10.11, 10.6, 10.5, 10.4 | [wodby/mariadb]                    | ✓             |                    |
 | [Node.js]       | 20, 18                      | [wodby/node]                       |               |                    |
 | [Varnish]       | 6.0                         | [wodby/varnish]                    |               |                    |
@@ -44,7 +44,7 @@ Full documentation is available at https://wodby.com/docs/stacks/ruby/local
 
 Images tags format is `[VERSION]-[STABILITY_TAG]` where:
 
-`[VERSION]` is the _version of an application_ (without patch version) running in a container, e.g. `wodby/nginx:1.15-x.x.x` where Nginx version is `1.15` and `x.x.x` is a stability tag. For some images we include both major and minor version like Ruby `2.5`, for others we include only major like Redis `5`. 
+`[VERSION]` is the _version of an application_ (without patch version) running in a container, e.g. `wodby/nginx:1.15-x.x.x` where Nginx version is `1.15` and `x.x.x` is a stability tag. For some images we include both major and minor version like Ruby `2.5`, for others we include only major like Valkey `7`. 
 
 `[STABILITY_TAG]` is the _version of an image_ that corresponds to a git tag of the image repository, e.g. `wodby/mariadb:10.2-3.3.8` has MariaDB `10.2` and stability tag [`3.3.8`](https://github.com/wodby/mariadb/releases/tag/3.3.8). New stability tags include patch updates for applications and image's fixes/improvements (new env vars, orchestration actions fixes, etc). Stability tag changes described in the corresponding a git tag description. Stability tags follow [semantic versioning](https://semver.org/).
 
@@ -75,11 +75,11 @@ This project is licensed under the MIT open source license.
 [Node.js]: https://wodby.com/docs/stacks/ruby/containers#node
 [OpenSMTPD]: https://wodby.com/docs/stacks/ruby/containers#opensmtpd
 [PostgreSQL]: https://wodby.com/docs/stacks/ruby/containers#postgres
-[Redis]: https://wodby.com/docs/stacks/ruby/containers#redis
 [Rsyslog]: https://wodby.com/docs/stacks/ruby/containers#rsyslog
 [Ruby]: https://wodby.com/docs/stacks/ruby/containers#ruby
 [Sidekiq]: https://wodby.com/docs/stacks/ruby/containers#sidekiq
 [Solr]: https://wodby.com/docs/stacks/solr
+[Valkey]: https://wodby.com/docs/stacks/ruby/containers#valkey
 [Varnish]: https://wodby.com/docs/stacks/ruby/containers#varnish
 
 [_/traefik]: https://hub.docker.com/_/traefik
@@ -95,8 +95,8 @@ This project is licensed under the MIT open source license.
 [wodby/node]: https://github.com/wodby/node
 [wodby/opensmtpd]: https://github.com/wodby/opensmtpd
 [wodby/postgres]: https://github.com/wodby/postgres
-[wodby/redis]: https://github.com/wodby/redis
 [wodby/rsyslog]: https://hub.docker.com/r/wodby/rsyslog
 [wodby/ruby]: https://github.com/wodby/ruby
 [wodby/solr]: https://github.com/wodby/solr
+[wodby/valkey]: https://github.com/wodby/valkey
 [wodby/varnish]: https://github.com/wodby/varnish
diff --git a/compose.yml b/compose.yml
@@ -53,7 +53,7 @@ services:
 #      DB_PASSWORD: $DB_PASSWORD
 #      DB_NAME: $DB_NAME
 #      DB_ADAPTER: $DB_ADAPTER
-#      REDIS_URL: redis://redis:6379
+#      REDIS_URL: redis://valkey:6379
 #    command: ["bundle", "exec", "sidekiq"]
 #    volumes:
 #    - ./:/usr/src/app:cached
@@ -98,9 +98,9 @@ services:
 #    - "traefik.http.services.${PROJECT_NAME}_varnish.loadbalancer.server.port=6081"
 #    - "traefik.http.routers.${PROJECT_NAME}_varnish.rule=Host(`varnish.${PROJECT_BASE_URL}`)"
 
-  redis:
-    container_name: "${PROJECT_NAME}_redis"
-    image: wodby/redis:$REDIS_TAG
+  valkey:
+    container_name: "${PROJECT_NAME}_valkey"
+    image: wodby/valkey:$VALKEY_TAG
 
 #  adminer:
 #    container_name: "${PROJECT_NAME}_adminer"

diff --git a/tests/.env b/tests/.env
@@ -4,7 +4,7 @@ DB_PASSWORD=ruby
 DB_HOST=postgres
 DB_ADAPTER=postgresql
 
-REDIS_TAG=7-4.4.2
+VALKEY_TAG=7-0.1.0
 POSTGRES_TAG=15-1.33.2
 NGINX_TAG=1.25-5.34.3
 

diff --git a/tests/compose.yml b/tests/compose.yml
@@ -37,13 +37,13 @@ services:
       DB_NAME: $DB_NAME
       DB_PASSWORD: $DB_PASSWORD
       DB_ADAPTER: $DB_ADAPTER
-      REDIS_URL: redis://redis:6379
+      REDIS_URL: redis://valkey:6379
     volumes:
       - codebase:/usr/src/app
     command: ["bundle", "exec", "sidekiq"]
 
-  redis:
-    image: wodby/redis:$REDIS_TAG
+  valkey:
+    image: wodby/valkey:$VALKEY_TAG
 
   nginx:
     image: wodby/nginx:$NGINX_TAG