From 076b6e48662d83758c6d93ecbf2fd168a0c670a5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Dec 2017 07:01:11 -0800 Subject: [PATCH 1/2] Fix "verify" and "depth" which are _not_ boolean values --- 3.7/alpine/docker-entrypoint.sh | 2 +- 3.7/debian/docker-entrypoint.sh | 2 +- 3.7/docker-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh index f939cb8b..876f73a3 100755 --- a/3.7/alpine/docker-entrypoint.sh +++ b/3.7/alpine/docker-entrypoint.sh @@ -244,7 +244,7 @@ rabbit_env_config() { local val="${!var:-}" local rawVal="$val" case "$conf" in - verify|fail_if_no_peer_cert|depth|hipe_compile) + fail_if_no_peer_cert|hipe_compile) [ -n "$val" ] && rawVal='true' || rawVal='false' ;; diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh index e7fdc28b..4f060f6e 100755 --- a/3.7/debian/docker-entrypoint.sh +++ b/3.7/debian/docker-entrypoint.sh @@ -244,7 +244,7 @@ rabbit_env_config() { local val="${!var:-}" local rawVal="$val" case "$conf" in - verify|fail_if_no_peer_cert|depth|hipe_compile) + fail_if_no_peer_cert|hipe_compile) [ -n "$val" ] && rawVal='true' || rawVal='false' ;; diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh index e7fdc28b..4f060f6e 100755 --- a/3.7/docker-entrypoint.sh +++ b/3.7/docker-entrypoint.sh @@ -244,7 +244,7 @@ rabbit_env_config() { local val="${!var:-}" local rawVal="$val" case "$conf" in - verify|fail_if_no_peer_cert|depth|hipe_compile) + fail_if_no_peer_cert|hipe_compile) [ -n "$val" ] && rawVal='true' || rawVal='false' ;; From c282d486e67439a8192b01a85ce4ce2679c27e1e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Dec 2017 07:04:54 -0800 Subject: [PATCH 2/2] Adjust boolean comparison to allow "false", "no", and "0" to all become "false" --- 3.7/alpine/docker-entrypoint.sh | 5 ++++- 3.7/debian/docker-entrypoint.sh | 5 ++++- 3.7/docker-entrypoint.sh | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh index 876f73a3..9b749d75 100755 --- a/3.7/alpine/docker-entrypoint.sh +++ b/3.7/alpine/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh index 4f060f6e..bb5b3c34 100755 --- a/3.7/debian/docker-entrypoint.sh +++ b/3.7/debian/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh index 4f060f6e..bb5b3c34 100755 --- a/3.7/docker-entrypoint.sh +++ b/3.7/docker-entrypoint.sh @@ -245,7 +245,10 @@ rabbit_env_config() { local rawVal="$val" case "$conf" in fail_if_no_peer_cert|hipe_compile) - [ -n "$val" ] && rawVal='true' || rawVal='false' + case "${val,,}" in + false|no|0|'') rawVal='false' ;; + true|yes|1|*) rawVal='true' ;; + esac ;; vm_memory_high_watermark) continue ;; # handled separately