Improve redis image readiness checks (#60365)

* Ensure that redis-cli readiness check is working

* First draft of readiness script in redis-store

* Add readiness script to redis-cache and redis-store

* Check rediness script in both images

* Duplicate readiness script

Author: willdollman

docker-images/redis-cache/BUILD.bazel

@@ -8,14 +8,26 @@ filegroup(
     srcs = ["redis.conf"],
 )
 
+filegroup(
+    name = "redis_readiness",
+    srcs = [
+        "readiness.sh",
+    ],
+)
+
 pkg_tar(
     name = "redis_tarball",
-    srcs = [":redis_conf"],
+    srcs = [
+        ":redis_conf",
+        ":redis_readiness",
+    ],
     modes = {
         "/etc/redis/redis.conf": "0644",
+        "/usr/local/bin/readiness.sh": "0755",
     },
     remap_paths = {
         "/redis.conf": "/etc/redis/redis.conf",
+        "/readiness.sh": "/usr/local/bin/readiness.sh",
     },
 )
 

docker-images/redis-cache/image_test.yaml

@@ -6,6 +6,11 @@ commandTests:
     args:
       - --version
 
+  - name: "readiness script available"
+    command: "/usr/local/bin/readiness.sh"
+    expectedError: ["Could not connect to Redis"]
+    exitCode: 1
+
   - name: "not running as root"
     command: "/usr/bin/id"
     args:

docker-images/redis-cache/readiness.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+response=$(
+  redis-cli ping
+)
+if [ "$response" != "PONG" ]; then
+  echo "$response"
+  exit 1
+fi

docker-images/redis-store/BUILD.bazel

@@ -4,18 +4,32 @@ load("//dev:oci_defs.bzl", "image_repository")
 load("@container_structure_test//:defs.bzl", "container_structure_test")
 
 filegroup(
-    name = "redis_conf",
-    srcs = ["redis.conf"],
+    name = "redis_config",
+    srcs = [
+        "redis.conf",
+    ],
+)
+
+filegroup(
+    name = "redis_readiness",
+    srcs = [
+        "readiness.sh",
+    ],
 )
 
 pkg_tar(
     name = "redis_tarball",
-    srcs = [":redis_conf"],
+    srcs = [
+        ":redis_config",
+        ":redis_readiness",
+    ],
     modes = {
         "/etc/redis/redis.conf": "0644",
+        "/usr/local/bin/readiness.sh": "0755",
     },
     remap_paths = {
         "/redis.conf": "/etc/redis/redis.conf",
+        "/readiness.sh": "/usr/local/bin/readiness.sh",
     },
 )
 

docker-images/redis-store/image_test.yaml

@@ -6,6 +6,11 @@ commandTests:
     args:
       - --version
 
+  - name: "readiness script available"
+    command: "/usr/local/bin/readiness.sh"
+    expectedError: ["Could not connect to Redis"]
+    exitCode: 1
+
   - name: "not running as root"
     command: "/usr/bin/id"
     args:

docker-images/redis-store/readiness.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+response=$(
+  redis-cli ping
+)
+if [ "$response" != "PONG" ]; then
+  echo "$response"
+  exit 1
+fi