From 692a1b048d7e1e62d51622142d9139cae31bc1f7 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 14 Jul 2020 12:31:01 +0000 Subject: [PATCH] Fix `LOG_LEVEL` environment variable to map onto command line argument -dd in docker-entrypoint.sh --- generate/templates/docker-entrypoint.sh.ps1 | 4 ++-- variants/alpine/cron-emailsender/docker-entrypoint.sh | 4 ++-- .../alpine/cron-geoip-geoip2-emailsender/docker-entrypoint.sh | 4 ++-- variants/alpine/cron-geoip-geoip2/docker-entrypoint.sh | 4 ++-- variants/alpine/cron-geoip/docker-entrypoint.sh | 4 ++-- variants/alpine/cron/docker-entrypoint.sh | 4 ++-- variants/alpine/emailsender/docker-entrypoint.sh | 4 ++-- variants/alpine/geoip-geoip2-emailsender/docker-entrypoint.sh | 4 ++-- variants/alpine/geoip-geoip2/docker-entrypoint.sh | 4 ++-- variants/alpine/geoip/docker-entrypoint.sh | 4 ++-- variants/ubuntu/cron-emailsender/docker-entrypoint.sh | 4 ++-- .../ubuntu/cron-geoip-geoip2-emailsender/docker-entrypoint.sh | 4 ++-- variants/ubuntu/cron-geoip-geoip2/docker-entrypoint.sh | 4 ++-- variants/ubuntu/cron-geoip/docker-entrypoint.sh | 4 ++-- variants/ubuntu/cron/docker-entrypoint.sh | 4 ++-- variants/ubuntu/emailsender/docker-entrypoint.sh | 4 ++-- variants/ubuntu/geoip-geoip2-emailsender/docker-entrypoint.sh | 4 ++-- variants/ubuntu/geoip-geoip2/docker-entrypoint.sh | 4 ++-- variants/ubuntu/geoip/docker-entrypoint.sh | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1 index e7db65b..1a8c71d 100644 --- a/generate/templates/docker-entrypoint.sh.ps1 +++ b/generate/templates/docker-entrypoint.sh.ps1 @@ -72,9 +72,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/cron-emailsender/docker-entrypoint.sh b/variants/alpine/cron-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/cron-emailsender/docker-entrypoint.sh +++ b/variants/alpine/cron-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/cron-geoip-geoip2-emailsender/docker-entrypoint.sh b/variants/alpine/cron-geoip-geoip2-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/cron-geoip-geoip2-emailsender/docker-entrypoint.sh +++ b/variants/alpine/cron-geoip-geoip2-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/cron-geoip-geoip2/docker-entrypoint.sh b/variants/alpine/cron-geoip-geoip2/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/cron-geoip-geoip2/docker-entrypoint.sh +++ b/variants/alpine/cron-geoip-geoip2/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/cron-geoip/docker-entrypoint.sh b/variants/alpine/cron-geoip/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/cron-geoip/docker-entrypoint.sh +++ b/variants/alpine/cron-geoip/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/cron/docker-entrypoint.sh b/variants/alpine/cron/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/cron/docker-entrypoint.sh +++ b/variants/alpine/cron/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/emailsender/docker-entrypoint.sh b/variants/alpine/emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/emailsender/docker-entrypoint.sh +++ b/variants/alpine/emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/geoip-geoip2-emailsender/docker-entrypoint.sh b/variants/alpine/geoip-geoip2-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/geoip-geoip2-emailsender/docker-entrypoint.sh +++ b/variants/alpine/geoip-geoip2-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/geoip-geoip2/docker-entrypoint.sh b/variants/alpine/geoip-geoip2/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/geoip-geoip2/docker-entrypoint.sh +++ b/variants/alpine/geoip-geoip2/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/alpine/geoip/docker-entrypoint.sh b/variants/alpine/geoip/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/alpine/geoip/docker-entrypoint.sh +++ b/variants/alpine/geoip/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/cron-emailsender/docker-entrypoint.sh b/variants/ubuntu/cron-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/cron-emailsender/docker-entrypoint.sh +++ b/variants/ubuntu/cron-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/cron-geoip-geoip2-emailsender/docker-entrypoint.sh b/variants/ubuntu/cron-geoip-geoip2-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/cron-geoip-geoip2-emailsender/docker-entrypoint.sh +++ b/variants/ubuntu/cron-geoip-geoip2-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/cron-geoip-geoip2/docker-entrypoint.sh b/variants/ubuntu/cron-geoip-geoip2/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/cron-geoip-geoip2/docker-entrypoint.sh +++ b/variants/ubuntu/cron-geoip-geoip2/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/cron-geoip/docker-entrypoint.sh b/variants/ubuntu/cron-geoip/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/cron-geoip/docker-entrypoint.sh +++ b/variants/ubuntu/cron-geoip/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/cron/docker-entrypoint.sh b/variants/ubuntu/cron/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/cron/docker-entrypoint.sh +++ b/variants/ubuntu/cron/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/emailsender/docker-entrypoint.sh b/variants/ubuntu/emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/emailsender/docker-entrypoint.sh +++ b/variants/ubuntu/emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/geoip-geoip2-emailsender/docker-entrypoint.sh b/variants/ubuntu/geoip-geoip2-emailsender/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/geoip-geoip2-emailsender/docker-entrypoint.sh +++ b/variants/ubuntu/geoip-geoip2-emailsender/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/geoip-geoip2/docker-entrypoint.sh b/variants/ubuntu/geoip-geoip2/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/geoip-geoip2/docker-entrypoint.sh +++ b/variants/ubuntu/geoip-geoip2/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi diff --git a/variants/ubuntu/geoip/docker-entrypoint.sh b/variants/ubuntu/geoip/docker-entrypoint.sh index 157b368..04623ee 100644 --- a/variants/ubuntu/geoip/docker-entrypoint.sh +++ b/variants/ubuntu/geoip/docker-entrypoint.sh @@ -71,9 +71,9 @@ if [ ! -z "${LOG_LEVEL}" ]; then if [ "${LOG_LEVEL}" = '0' ]; then set "$@" "-n" elif [ "${LOG_LEVEL}" = '1' ]; then - : - elif [ "${LOG_LEVEL}" = '2' ]; then set "$@" "-d" + elif [ "${LOG_LEVEL}" = '2' ]; then + set "$@" "-dd" else : fi