Commit 29890891 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/curl-ca-bundle' into 'main' 

fix: keep system ca in curl_ca_bundle

Closes #31

See merge request to-be-continuous/sonar!65
parents 4e16a7a2 1eb79276

templates/gitlab-ci-sonar.yml

+17 −10
Original line number Diff line number Diff line
@@ -172,19 +172,26 @@ stages: 
    then

      return

    fi

    # create a writable folder for the keystore and certs

    mkdir -p /tmp/certs



    # import in system

    if as_content "$certs" >> /tmp/certs/ca-certificates.crt

    # import in system for regular linux (Ubuntu, Debian) image

    if [[ -w /etc/ssl/certs/ca-certificates.crt ]]

    then

      log_info "CA certificates imported in \\e[33;1m/tmp/certs/ca-certificates.crt\\e[0m"

      export CURL_CA_BUNDLE=/tmp/certs/ca-certificates.crt

    fi

    if as_content "$certs" >> /tmp/certs/cert.pem

      as_content "$certs" >> /etc/ssl/certs/ca-certificates.crt

      log_info "Custom CA certificates imported in \\e[33;1m/etc/ssl/certs/ca-certificates.crt\\e[0m"

    # import in system for regular linux (Fedora, RHEL) image (e.g. Skopeo image)

    elif [[ -w /etc/ssl/certs/ca-bundle.crt ]]

    then

      as_content "$certs" >> /etc/ssl/certs/ca-bundle.crt

      log_info "Custom CA certificates imported in \\e[33;1m/etc/ssl/certs/ca-bundle.crt\\e[0m"

    # import in rootless systems : loaded with environment variable

    else

      if [[ -f /etc/ssl/certs/ca-certificates.crt ]]

      then

      log_info "CA certificates imported in \\e[33;1m/tmp/certs/cert.pem\\e[0m"

      export CURL_CA_BUNDLE=/tmp/certs/cert.pem

        cp /etc/ssl/certs/ca-certificates.crt /tmp/ca-certificates.crt

      fi

      as_content "$certs" >> /tmp/ca-certificates.crt

      log_info "Custom CA certificates imported in \\e[33;1m/tmp/ca-certificates.crt\\e[0m"

      export CURL_CA_BUNDLE=/tmp/ca-certificates.crt

    fi



    # import in Java keystore (if keytool command found)