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

feature/1210Validate Settlement Model Definition #594

Merged
merged 4 commits into from
Feb 14, 2020
Merged

feature/1210Validate Settlement Model Definition #594

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb7345c
Implemented settlement model definition validation. Node upgrade
ggrg Feb 13, 2020
acd5fd5
9.1.2-snapshot
ggrg Feb 13, 2020
9d9717e
Fix coverage
ggrg Feb 13, 2020
ff83c3b
Change as per PR request
ggrg Feb 14, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ executors:
default-docker:
working_directory: /home/circleci/project
docker:
- image: node:10.15.3-alpine
- image: mhart/alpine-node:12.16.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use node:12.16.0-alpine


default-machine:
machine:
Expand Down
9 changes: 1 addition & 8 deletions .ncurc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"reject": [
"@hapi/good",
"@hapi/hapi",
"@hapi/inert",
"@hapi/vision",
"@hapi/joi",
"hapi-swagger"
]
"reject": []
}
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.15.1
12.16.0
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3-alpine as builder
FROM mhart/alpine-node:12.16.0 as builder
ggrg marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /opt/central-ledger

RUN apk add --no-cache -t build-dependencies git make gcc g++ python libtool autoconf automake \
Expand All @@ -14,7 +14,7 @@ COPY config /opt/central-ledger/config
COPY migrations /opt/central-ledger/migrations
COPY seeds /opt/central-ledger/seeds

FROM node:10.15.3-alpine
FROM mhart/alpine-node:12.16.0
ggrg marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /opt/central-ledger

COPY --from=builder /opt/central-ledger .
Expand Down
49 changes: 1 addition & 48 deletions audit-resolve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1 @@
{
"decisions": {
"1164|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1569472078085
},
"1164|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1569472078086
},
"1184|npm-check-updates>pacote>make-fetch-happen>https-proxy-agent": {
"decision": "ignore",
"madeAt": 1571649787349,
"expiresAt": 1574241710583
},
"1184|npm-check-updates>pacote>npm-registry-fetch>make-fetch-happen>https-proxy-agent": {
"decision": "ignore",
"madeAt": 1571649787349,
"expiresAt": 1574241710583
},
"1316|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1316|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1324|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1324|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1325|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1325|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
}
},
"rules": {},
"version": 1
}

Loading