diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95e90a4e..9c6fec02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -270,7 +270,7 @@ check-gobinsec: - cp ./gobinsec-cache-valid.yml ./gobinsec-cache.yml script: - cat ./gobinsec-cache.yml - - gobinsec -wait -cache -config utils/gobinsec_conf.yml build/bridge + - ./utils/run_gobinsec.sh - cp ./gobinsec-cache.yml ./gobinsec-cache-valid.yml # Only update cache file if gobinsec succeeds diff --git a/utils/gobinsec_conf.yml b/utils/gobinsec_conf.yml index d5f2b712..1fbb913a 100644 --- a/utils/gobinsec_conf.yml +++ b/utils/gobinsec_conf.yml @@ -5,3 +5,7 @@ wait: true file: name: "./gobinsec-cache.yml" expiration: 24h + +ignore: + # golang.org/x/net wrong match, we are using 2871e0cb, fixed by 37e1c6af + - "CVE-2021-33194" \ No newline at end of file diff --git a/utils/run_gobinsec.sh b/utils/run_gobinsec.sh new file mode 100755 index 00000000..f042b684 --- /dev/null +++ b/utils/run_gobinsec.sh @@ -0,0 +1,5 @@ +#!/bin/bash +gobinsec -wait -cache -config utils/gobinsec_conf.yml build/bridge || FAILED=true +if [ $FAILED ]; then + gobinsec -wait -cache -config utils/gobinsec_conf.yml build/bridge +fi \ No newline at end of file