From 196b742ba271fd7e3521448f83e8a2914f5c7dc6 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 31 Mar 2022 12:24:04 +0200 Subject: Fix disabling of curlrc in healthcheck_curl The -q (aka --disable) option only works if it is the first parameter on the command line. Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f Closes-Bug: #1967272 --- docker/base/healthcheck_curl | 2 +- .../notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml diff --git a/docker/base/healthcheck_curl b/docker/base/healthcheck_curl index 2ef8538ba..6df232fe8 100755 --- a/docker/base/healthcheck_curl +++ b/docker/base/healthcheck_curl @@ -5,7 +5,7 @@ : ${HEALTHCHECK_CURL_OUTPUT:='/dev/null'} export NSS_SDB_USE_CACHE=no -curl -g -k -q -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \ +curl -q -g -k -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \ --max-time "${HEALTHCHECK_CURL_MAX_TIME}" \ --user-agent "${HEALTHCHECK_CURL_USER_AGENT}" \ --write-out "${HEALTHCHECK_CURL_WRITE_OUT}" \ diff --git a/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml new file mode 100644 index 000000000..c1c00d6ce --- /dev/null +++ b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes disabling the use of the ``curlrc`` configuration file in + ``healthcheck_curl``. `LP#1967272 `__ -- cgit v1.2.3