Merge pull request rails#53864 from jjatinggoyal/valkey

Switch Redis image to Valkey in rails generators and devcontainers

Author: byroot

.devcontainer/compose.yaml

@@ -38,7 +38,7 @@ services:
       MARIADB_ROOT_PASSWORD: root
 
   redis:
-    image: redis:latest
+    image: valkey/valkey:8
     restart: unless-stopped
     volumes:
       - redis-data:/data

railties/lib/rails/generators/rails/app/templates/config/deploy.yml.tt

@@ -121,7 +121,7 @@ builder:
 #     directories:
 #       - data:/var/lib/mysql
 #   redis:
-#     image: redis:7.0
+#     image: valkey/valkey:8
 #     host: 192.168.0.2
 #     port: 6379
 #     directories:

railties/lib/rails/generators/rails/app/templates/github/ci.yml.tt

@@ -66,7 +66,7 @@ jobs:
     <%- if options[:database] == "sqlite3" -%>
     # services:
     #  redis:
-    #    image: redis
+    #    image: valkey/valkey:8
     #    ports:
     #      - 6379:6379
     #    options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
@@ -92,7 +92,7 @@ jobs:
       <%- end -%>
 
       # redis:
-      #   image: redis
+      #   image: valkey/valkey:8
       #   ports:
       #     - 6379:6379
       #   options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5

railties/lib/rails/generators/rails/devcontainer/templates/devcontainer/compose.yaml.tt

@@ -32,7 +32,7 @@ services:
 
 <%- if options[:redis] -%>
   redis:
-    image: redis:7.2
+    image: valkey/valkey:8
     restart: unless-stopped
     volumes:
     - redis-data:/data

railties/lib/rails/generators/rails/plugin/templates/github/ci.yml.tt

@@ -30,7 +30,7 @@ jobs:
     <%- if options[:database] == "sqlite3" -%>
     # services:
     #  redis:
-    #    image: redis
+    #    image: valkey/valkey:8
     #    ports:
     #      - 6379:6379
     #    options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
@@ -56,7 +56,7 @@ jobs:
       <%- end -%>
 
       # redis:
-      #   image: redis
+      #   image: valkey/valkey:8
       #   ports:
       #     - 6379:6379
       #   options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5

railties/test/fixtures/.devcontainer/compose.yaml

@@ -24,7 +24,7 @@ services:
     restart: unless-stopped
 
   redis:
-    image: redis:7.2
+    image: valkey/valkey:8
     restart: unless-stopped
     volumes:
     - redis-data:/data

railties/test/generators/app_generator_test.rb

@@ -1372,7 +1372,7 @@ def test_devcontainer_include_redis_skipping_solid
       assert_includes compose_config["services"]["rails-app"]["depends_on"], "redis"
 
       expected_redis_config = {
-        "image" => "redis:7.2",
+        "image" => "valkey/valkey:8",
         "restart" => "unless-stopped",
         "volumes" => ["redis-data:/data"]
       }

railties/test/generators/devcontainer_generator_test.rb

@@ -254,7 +254,7 @@ def test_redis_option_default
         assert_compose_file do |compose|
           assert_includes compose["services"]["rails-app"]["depends_on"], "redis"
           expected_redis_config = {
-            "image" => "redis:7.2",
+            "image" => "valkey/valkey:8",
             "restart" => "unless-stopped",
             "volumes" => ["redis-data:/data"]
           }