Skip to content
Snippets Groups Projects
Commit b4373edb authored by Guilhem Bonnefille's avatar Guilhem Bonnefille Committed by Pierre Smeyers
Browse files

fix: use keystore when either DEFAULT_CA_CERTS or CUSTOM_CA_CERTS are set

parent 626d6734
No related branches found
No related tags found
No related merge requests found
...@@ -431,13 +431,11 @@ sonar: ...@@ -431,13 +431,11 @@ sonar:
export SONAR_TOKEN="$SONAR_AUTH_TOKEN" export SONAR_TOKEN="$SONAR_AUTH_TOKEN"
fi fi
- | - |
if [[ -z "$CUSTOM_CA_CERTS" ]] if [[ "$CUSTOM_CA_CERTS" ]] || [[ "$DEFAULT_CA_CERTS" ]]
then then
log_info '$CUSTOM_CA_CERTS not set: using default keystore' log_info "Custom CA certificates detected: using custom Java KeyStore"
else
log_info '$CUSTOM_CA_CERTS variable detected: using writable keystore path (/tmp/writable_keystore)'
export CUSTOM_KEYSTORE_PATH="/tmp/writable_keystore" export CUSTOM_KEYSTORE_PATH="/tmp/writable_keystore"
export CUSTOM_KEYSTORE_PASSWORD="changeit" export CUSTOM_KEYSTORE_PASSWORD=${JAVA_KEYSTORE_PASSWORD:-changeit}
fi fi
- >- - >-
sonar-scanner ${TRACE+-Dsonar.verbose=true} $java_proxy_args sonar-scanner ${TRACE+-Dsonar.verbose=true} $java_proxy_args
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment