Replace redis with valkey

wodby · May 6, 2024 · 1a67d43 · 1a67d43
1 parent 2183b2f
commit 1a67d43
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/.env b/.env
@@ -28,7 +28,7 @@ MARIADB_TAG=10.11-3.28.2
 
 ### --- VANILLA DRUPAL ----
 
-DRUPAL_TAG=10-4.70.6
+DRUPAL_TAG=10-8.3
 #DRUPAL_TAG=7-4.70.6
 
 ### --- PHP ----
@@ -79,10 +79,9 @@ ELASTICSEARCH_TAG=7-5.19.6
 
 KIBANA_TAG=7-5.19.6
 
-### --- REDIS ---
+### --- VALKEY ---
 
-REDIS_TAG=7-4.4.2
-#REDIS_TAG=6-4.4.2
+VALKEY_TAG=7-0.1.0
 
 ### --- NODE ---
 

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The Drupal stack consist of the following containers:
 | Crond           |                             | [wodby/drupal-php]                 | ✓             | ✓                  |
 | [MariaDB]       | 11, 10.11, 10.6, 10.5, 10.4 | [wodby/mariadb]                    | ✓             | ✓                  |
 | [PostgreSQL]    | 16, 15, 14, 13, 12          | [wodby/postgres]                   | ✓             |                    |
-| [Redis]         | 7, 6                        | [wodby/redis]                      | ✓             |                    |
+| [Valkey]        | 7                           | [wodby/valkey]                     | ✓             |                    |
 | [Memcached]     | 1                           | [wodby/memcached]                  |               |                    |
 | [Varnish]       | 6.0                         | [wodby/varnish]                    | ✓             |                    |
 | [Node.js]       | 20, 18                      | [wodby/node]                       |               |                    |
@@ -120,7 +120,7 @@ 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/valkey]: https://github.com/wodby/valkey
 [wodby/rsyslog]: https://hub.docker.com/r/wodby/rsyslog
 [wodby/solr]: https://github.com/wodby/solr
 [wodby/varnish]: https://github.com/wodby/varnish

diff --git a/compose.yml b/compose.yml
@@ -138,9 +138,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/10/.env b/tests/10/.env
@@ -6,7 +6,7 @@ DB_HOST=mariadb
 DB_DRIVER=mysql
 
 MARIADB_TAG=10.11-3.28.2
-REDIS_TAG=7-4.4.2
+VALKEY_TAG=7-0.1.0
 VARNISH_TAG=6.0-4.16.2
 SOLR_TAG=8-4.18.2
 SOLR_CONFIG_SET="search_api_solr_4.1.6"

diff --git a/tests/10/compose.yml b/tests/10/compose.yml
@@ -55,10 +55,10 @@ services:
       VARNISH_CONFIG_PRESET: drupal
       VARNISH_PURGE_EXTERNAL_REQUEST_HEADER: X-Real-IP
 
-  redis:
-    image: wodby/redis:$REDIS_TAG
+  valkey:
+    image: wodby/valkey:$VALKEY_TAG
     environment:
-      REDIS_PASSWORD: bad-password
+      VALKEY_PASSWORD: bad-password
 
   solr:
     image: wodby/solr:$SOLR_TAG

diff --git a/tests/10/test.settings.php b/tests/10/test.settings.php
@@ -4,7 +4,7 @@
   ? 'sites/all/modules/contrib'
   : 'sites/all/modules';
 
-$settings['redis.connection']['host'] = 'redis';
+$settings['redis.connection']['host'] = 'valkey';
 $settings['redis.connection']['port'] = '6379';
 $settings['redis.connection']['password'] = 'bad-password';
 $settings['redis.connection']['base'] = 0;

diff --git a/tests/7/.env b/tests/7/.env
@@ -6,7 +6,7 @@ DB_HOST=mariadb
 DB_DRIVER=mysql
 
 MARIADB_TAG=10.11-3.28.2
-REDIS_TAG=7-4.4.2
+VALKEY_TAG=7-0.1.0
 VARNISH_TAG=6.0-4.16.2
 SOLR_TAG=7-4.15.0
 SOLR_CONFIG_SET="search_api_solr_7.x-1.14"

diff --git a/tests/7/compose.yml b/tests/7/compose.yml
@@ -52,10 +52,10 @@ services:
       VARNISH_CONFIG_PRESET: drupal
       VARNISH_PURGE_EXTERNAL_REQUEST_HEADER: X-Real-IP
 
-  redis:
-    image: wodby/redis:$REDIS_TAG
+  valkey:
+    image: wodby/valkey:$VALKEY_TAG
     environment:
-      REDIS_PASSWORD: bad-password
+      VALKEY_PASSWORD: bad-password
 
   solr:
     image: wodby/solr:$SOLR_TAG

diff --git a/tests/7/test.settings.php b/tests/7/test.settings.php
@@ -19,7 +19,7 @@
   $conf['cache_default_class'] = 'Redis_Cache';
   $conf['cache_class_cache_form'] = 'DrupalDatabaseCache';
 
-  $conf['redis_client_host'] = 'redis';
+  $conf['redis_client_host'] = 'valkey';
   $conf['redis_client_port'] = '6379';
   $conf['redis_client_password'] = 'bad-password';
 }