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

Merge branch 'fix/curl-not-slim' into 'master' 

fix: issue github_get_latest_version and README for trivy

Closes #73 and #74

See merge request to-be-continuous/python!106
parents 3693e7f3 f5d5f2e9

README.md

+3 −1
Original line number Diff line number Diff line
@@ -236,7 +236,9 @@ In addition to a textual report in the console, this job produces the following 


### `py-trivy` job (dependency check)



This job is **disabled by default** and performs a dependency check analysis using [Trivy](https://github.com/aquasecurity/trivy/).

This job performs a dependency check analysis using [Trivy](https://github.com/aquasecurity/trivy/).

:warning:  This job is now **enabled by default** since version 7.0.0





It is bound to the `test` stage, and uses the following variables:

templates/gitlab-ci-python.yml

+1 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ variables: 
  function github_get_latest_version() {

    if command -v curl &> /dev/null

    then

      curl -sSf -I "https://github.com/$1/releases/latest" | awk -F '/' '/location:/ {print $NF}'

      curl -sSf -I "https://github.com/$1/releases/latest" | awk -F '/' -v RS='\r\n' '/location:/ {print $NF}'

    elif command -v python3 &> /dev/null

    then

      python3 -c "import urllib.request;url='https://github.com/$1/releases/latest';opener=urllib.request.build_opener(type('NoRedirection', (urllib.request.HTTPErrorProcessor,), {'http_response': lambda self, req, resp: resp, 'https_response': lambda self, req, resp: resp})());req=urllib.request.Request(url, method='HEAD');print(opener.open(req).headers.get('Location').split('/')[-1])"