From 1c8cee61f3d72cc5c3ea868233699a6e29f3435b Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 10 Jun 2020 19:44:57 +0530 Subject: [PATCH 1/3] Updated python in some other places in circle CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 77a706b1c..a05461d38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ defaults_Dependencies: &defaults_Dependencies | apk --no-cache add ca-certificates apk --no-cache add curl apk --no-cache add openssh-client - apk add --no-cache -t build-dependencies make gcc g++ python libtool autoconf automake + apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake npm config set unsafe-perm true npm install -g node-gyp From ce146a6477eddd4a8d734441ddeda662786f8053 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 10 Jun 2020 22:57:01 +0530 Subject: [PATCH 2/3] Some fix in image scan --- .circleci/config.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a05461d38..6864b8836 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,18 +21,19 @@ defaults_Dependencies: &defaults_Dependencies | apk --no-cache add ca-certificates apk --no-cache add curl apk --no-cache add openssh-client - apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake + apk add --no-cache -t build-dependencies make gcc g++ python libtool autoconf automake npm config set unsafe-perm true npm install -g node-gyp defaults_awsCliDependencies: &defaults_awsCliDependencies | + apk upgrade --no-cache apk --no-cache add \ python3 \ py3-pip \ groff \ less \ mailcap - pip3 install --upgrade awscli==1.14.5 s3cmd==2.0.1 python-magic + pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic defaults_license_scanner: &defaults_license_scanner name: Install and set up license-scanner @@ -54,7 +55,6 @@ executors: default-machine: machine: image: ubuntu-1604:201903-01 - ## # Jobs # @@ -243,7 +243,14 @@ jobs: apk add --update py-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm - run: name: Install general dependencies - command: *defaults_Dependencies + command: | + apk --no-cache add git + apk --no-cache add ca-certificates + apk --no-cache add curl + apk --no-cache add openssh-client + apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake + npm config set unsafe-perm true + npm install -g node-gyp - run: name: Install AWS CLI dependencies command: *defaults_awsCliDependencies From 7628e6164e6bc986b4d1d099e78baadcc1e1d971 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 10 Jun 2020 23:09:12 +0530 Subject: [PATCH 3/3] Resolved audit checks --- audit-resolve.json | 50 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/audit-resolve.json b/audit-resolve.json index e5f8b672f..de9d7db49 100644 --- a/audit-resolve.json +++ b/audit-resolve.json @@ -33,54 +33,44 @@ "madeAt": 1587002695126 }, "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037826, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810710821 }, "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810711608 }, "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810711608 }, "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810711608 }, "1179|faucet>minimist": { - "decision": "ignore", - "madeAt": 1591201037827, - "expiresAt": 1591805821641 + "decision": "postpone", + "madeAt": 1591810696982 }, "1500|npm-audit-resolver>yargs-parser": { "decision": "fix",