Skip to content

Commit 4685a4d

Browse files
antonysouthworth-halterkurtmc
authored andcommitted
fix PID and process leak
1 parent c46e68d commit 4685a4d

5 files changed

+7
-6
lines changed

Dockerfile.valkey

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ FROM alpine:3.21.3 AS valkey
2323
RUN apk add --no-cache \
2424
openssl=3.3.3-r0 \
2525
ca-certificates=20241121-r1 \
26+
coreutils=9.5-r2 \
2627
&& addgroup -S valkey -g 1009 \
2728
&& adduser -S -G valkey valkey -u 1009 \
2829
&& mkdir /etc/valkey \

internal/controller/scripts/ping_liveness_local.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33
if [ ! -z "$VALKEY_PASSWORD" ]; then export REDISCLI_AUTH=$VALKEY_PASSWORD; fi;
44
response=$(
5-
timeout -s 15 $1 \
5+
timeout --foreground -s 15 $1 \
66
valkey-cli \
77
-h localhost \
88
-p $VALKEY_PORT_NUMBER \

internal/controller/scripts/ping_liveness_local_tls.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
if [ ! -z "$VALKEY_PASSWORD" ]; then export REDISCLI_AUTH=$VALKEY_PASSWORD; fi;
55

66
response=$(
7-
timeout -s 15 $1 \
7+
timeout --foreground -s 15 $1 \
88
valkey-cli \
99
-h localhost \
1010
-p $VALKEY_TLS_PORT_NUMBER \

internal/controller/scripts/ping_readiness_local.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
VALKEY_STATUS_FILE=/tmp/.valkey_cluster_check
55
if [ ! -z "$VALKEY_PASSWORD" ]; then export REDISCLI_AUTH=$VALKEY_PASSWORD; fi;
66
response=$(
7-
timeout -s 15 $1 \
7+
timeout --foreground -s 15 $1 \
88
valkey-cli \
99
-h localhost \
1010
-p $VALKEY_PORT_NUMBER \
@@ -21,7 +21,7 @@ fi
2121
nodes=$(echo $VALKEY_NODES | wc -w)
2222
if [ ! -f "$VALKEY_STATUS_FILE" ] && [ "$nodes" != "1" ]; then
2323
response=$(
24-
timeout -s 15 $1 \
24+
timeout --foreground -s 15 $1 \
2525
valkey-cli \
2626
-h localhost \
2727
-p $VALKEY_PORT_NUMBER \

internal/controller/scripts/ping_readiness_local_tls.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VALKEY_STATUS_FILE=/tmp/.valkey_cluster_check
55
if [ ! -z "$VALKEY_PASSWORD" ]; then export REDISCLI_AUTH=$VALKEY_PASSWORD; fi;
66

77
response=$(
8-
timeout -s 15 $1 \
8+
timeout --foreground -s 15 $1 \
99
valkey-cli \
1010
-h localhost \
1111
-p $VALKEY_TLS_PORT_NUMBER \
@@ -28,7 +28,7 @@ fi
2828
count=$(echo $VALKEY_NODES | wc -w)
2929
if [ ! -f "$VALKEY_STATUS_FILE" ] && [ "$count" != "1" ]; then
3030
response=$(
31-
timeout -s 15 $1 \
31+
timeout --foreground -s 15 $1 \
3232
valkey-cli \
3333
-h localhost \
3434
-p $VALKEY_TLS_PORT_NUMBER \

0 commit comments

Comments
 (0)