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
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -431,13 +431,11 @@ sonar:
        export SONAR_TOKEN="$SONAR_AUTH_TOKEN"
      fi
    - |
      if [[ -z "$CUSTOM_CA_CERTS" ]]
      if [[ "$CUSTOM_CA_CERTS" ]] || [[ "$DEFAULT_CA_CERTS" ]]
      then
        log_info '$CUSTOM_CA_CERTS not set: using default keystore'
      else
        log_info '$CUSTOM_CA_CERTS variable detected: using writable keystore path (/tmp/writable_keystore)'
        log_info "Custom CA certificates detected: using custom Java KeyStore"
        export CUSTOM_KEYSTORE_PATH="/tmp/writable_keystore"
        export CUSTOM_KEYSTORE_PASSWORD="changeit"
        export CUSTOM_KEYSTORE_PASSWORD=${JAVA_KEYSTORE_PASSWORD:-changeit}
      fi
    - >-
      sonar-scanner ${TRACE+-Dsonar.verbose=true} $java_proxy_args