From efe8183b856dfee1fbc935b9ca9ebeeda36f862f Mon Sep 17 00:00:00 2001 From: curben Date: Tue, 30 Oct 2018 20:29:09 +1030 Subject: [PATCH] test: fix snyk unable to patch snyk requires GNU's patch that support --backup argument, the argument is not supported by alpine built-in busybox's patch https://github.com/snyk/snyk/issues/108#issuecomment-412937627 https://github.com/snyk/snyk/issues/99#issuecomment-322202989 previous commit (faa286cb5f2242a9027fed439caa8a4074919bd5) did not fix --- .gitlab-ci.yml | 1 + .snyk | 20 ++++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 315d7f6..bec2e00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ before_script: test: script: + - apk add patch # Install GNU version of patch for snyk - npm run build only: diff --git a/.snyk b/.snyk index 87a5924..86176ce 100644 --- a/.snyk +++ b/.snyk @@ -25,17 +25,13 @@ ignore: - renovate > docker-registry-client > tough-cookie: reason: Patch/update unavailable expires: '2018-12-31T00:00:00.000Z' - 'npm:lodash:20180130': - - renovate > docker-registry-client > restify-clients > restify-errors > lodash: - reason: Patch failure - expires: '2018-11-31T00:00:00.000Z' - - renovate > docker-registry-client > restify-errors > lodash: - reason: Patch failure - expires: '2018-11-31T00:00:00.000Z' - 'npm:tough-cookie:20160722': - - renovate > docker-registry-client > tough-cookie: - reason: Patch failure - expires: '2018-11-31T00:00:00.000Z' # patches apply the minimum changes required to fix a vulnerability patch: - + 'npm:lodash:20180130': + - renovate > docker-registry-client > restify-clients > restify-errors > lodash: + patched: '2018-10-27T00:00:00.000Z' + - renovate > docker-registry-client > restify-errors > lodash: + patched: '2018-10-27T00:00:00.000Z' + 'npm:tough-cookie:20160722': + - renovate > docker-registry-client > tough-cookie: + patched: '2018-10-27T00:00:00.000Z'