Commit e05ea122 authored by Clement Bois's avatar Clement Bois
Browse files

Merge branch 'fix/syft-custom-ca' into 'master' 

fix: register custom ca for syft

Closes #125

See merge request to-be-continuous/docker!152
parents 5b1f7e75 bc7f70fb

templates/gitlab-ci-docker.yml

+6 −2
Original line number Diff line number Diff line
@@ -349,9 +349,11 @@ stages: 
    elif [[ -d /kaniko/ssl/certs ]]

    then

      echo "$certs" | tr -d '\r' >> /kaniko/ssl/certs/ca-certificates.crt

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

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

    # for syft : loaded with environment variable

    else

      log_warn "Custom CA certificates not imported: no supported location found"

      echo "$certs" | tr -d '\r' >> /tmp/ca-certificates.crt

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

    fi

  }
@@ -1120,6 +1122,8 @@ docker-sbom: 
  image:

    name: $DOCKER_SBOM_IMAGE

    entrypoint: [""]

  variables:

    SYFT_REGISTRY_CA_CERT: /tmp/ca-certificates.crt

  script:

    - log_info "Extracting SBOM from ${DOCKER_SNAPSHOT_IMAGE}..."

    - |