Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated python in some other places in circle CI #742

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Updated python in some other places in circle CI #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c8cee6
Updated python in some other places in circle CI
Jun 10, 2020
ce146a6
Some fix in image scan
Jun 10, 2020
7628e61
Resolved audit checks
Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ defaults_Dependencies: &defaults_Dependencies |
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
Expand All @@ -54,7 +55,6 @@ executors:
default-machine:
machine:
image: ubuntu-1604:201903-01

##
# Jobs
#
Expand Down Expand Up @@ -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
Expand Down
50 changes: 20 additions & 30 deletions audit-resolve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down