Merge "Fix disabling of curlrc in healthcheck_curl" into stable/xena

stackhpc · Apr 5, 2022 · 066851b · 066851b
2 parents 58f83d7 + 5197793
commit 066851b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes disabling the use of the ``curlrc`` configuration file in
+    ``healthcheck_curl``. `LP#1967272 <https://launchpad.net/bugs/1967272>`__