Skip to content

Commit

Permalink
Upgrade to Node 12.16.0 LTS. (#20)
Browse files Browse the repository at this point in the history
* Upgrade to Node 12.16.0 LTS.

* Lock versions for hapi libs with breaking changes

* Update ncurc file
  • Loading branch information
oderayi authored Feb 14, 2020
1 parent 5cd00af commit 2ad2d8d
Show file tree
Hide file tree
Showing 9 changed files with 2,279 additions and 1,517 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,16 @@ defaults_working_directory: &defaults_working_directory
executors:
default-docker:
working_directory: /home/circleci/project
docker:
- image: node:10.15.3-alpine
docker:
- image: node:12.16.0-alpine

default-machine:
machine:
image: ubuntu-1604:201903-01

helm-kube:
working_directory: /home/circleci/project
docker:
docker:
- image: hypnoglow/kubernetes-helm

##
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
root: /tmp
paths:
- ./docker-image.tar

license-scan:
executor: default-machine
# <<: *defaults_test_env
Expand Down Expand Up @@ -361,7 +361,7 @@ jobs:
aws s3 cp anchore-reports ${AWS_S3_DIR_ANCHORE_REPORTS}/${CIRCLE_PROJECT_REPONAME}/ --recursive
aws s3 rm ${AWS_S3_DIR_ANCHORE_REPORTS}/latest/ --recursive --exclude "*" --include "${CIRCLE_PROJECT_REPONAME}*"
aws s3 cp anchore-reports ${AWS_S3_DIR_ANCHORE_REPORTS}/latest/ --recursive
# TODO: Enable this when we want to increase the strictness of our security policies
# failCount=$(cat anchore-reports/*policy*.json | grep 'fail' | wc -l)
# echo "FailCount is: ${failCount}"
Expand Down
8 changes: 8 additions & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"reject": [
"@hapi/hapi",
"@hapi/inert",
"@hapi/vision",
"hapi-swagger"
]
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.9.4
12.16.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.3-alpine as builder
FROM node:12.16.0-alpine as builder
USER root

WORKDIR /opt/bulk-api-adapter
Expand All @@ -15,7 +15,7 @@ RUN npm install
COPY src /opt/bulk-api-adapter/src
COPY config /opt/bulk-api-adapter/config

FROM node:10.15.3-alpine
FROM node:12.16.0-alpine
WORKDIR /opt/bulk-api-adapter

COPY --from=builder /opt/bulk-api-adapter .
Expand Down
11 changes: 0 additions & 11 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
{
"decisions": {
"1168|hapi>subtext": {
"decision": "ignore",
"madeAt": 1571955733737,
"expiresAt": 1574547708550
}
},
"rules": {},
"version": 1
}
Loading

0 comments on commit 2ad2d8d

Please sign in to comment.