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.

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

feat!: upgrade ci, image, packages, audit #82

Merged
merged 10 commits into from
Jul 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
511 changes: 348 additions & 163 deletions .circleci/config.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.16.0
16.15.0
27 changes: 13 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
FROM node:12.16.1-alpine as builder
FROM node:16.15.0-alpine as builder
USER root

WORKDIR /opt/bulk-api-adapter
WORKDIR /opt/app/

RUN apk --no-cache add git
RUN apk add --no-cache -t build-dependencies make gcc g++ python libtool autoconf automake \
RUN apk add --no-cache -t build-dependencies git make gcc g++ python3 libtool autoconf automake \
&& cd $(npm root -g)/npm \
&& npm config set unsafe-perm true \
&& npm install -g node-gyp

COPY package.json package-lock.json* /opt/bulk-api-adapter/
RUN npm install
COPY package.json package-lock.json* /opt/app/
RUN npm ci

COPY src /opt/bulk-api-adapter/src
COPY config /opt/bulk-api-adapter/config
COPY src /opt/app/src
COPY config /opt/app/config

FROM node:12.16.1-alpine
WORKDIR /opt/bulk-api-adapter
FROM node:16.15.0-alpine
WORKDIR /opt/app/

# Create empty log file & link stdout to the application log file
RUN mkdir ./logs && touch ./logs/combined.log
RUN ln -sf /dev/stdout ./logs/combined.log

# Create a non-root user: ml-user
RUN adduser -D ml-user
USER ml-user
# Create a non-root user: app-user
RUN adduser -D app-user
USER app-user

COPY --chown=ml-user --from=builder /opt/bulk-api-adapter .
COPY --chown=app-user --from=builder /opt/app/ .
RUN npm prune --production

EXPOSE 3000
Expand Down
120 changes: 120 additions & 0 deletions audit-resolve.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,126 @@
"decision": "ignore",
"madeAt": 1646649536510,
"expiresAt": 1649241522406
},
"1075703|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
"decision": "ignore",
"madeAt": 1657031095208,
"expiresAt": 1659623091422
},
"1075703|@mojaloop/event-sdk>grpc>protobufjs": {
"decision": "ignore",
"madeAt": 1657031095208,
"expiresAt": 1659623091422
},
"1075704|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
"decision": "ignore",
"madeAt": 1657031101850,
"expiresAt": 1659623091422
},
"1075704|@mojaloop/event-sdk>grpc>protobufjs": {
"decision": "ignore",
"madeAt": 1657031101850,
"expiresAt": 1659623091422
},
"1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it": {
"decision": "ignore",
"madeAt": 1657031102685,
"expiresAt": 1659623091422
},
"1070030|widdershins>markdown-it": {
"decision": "ignore",
"madeAt": 1657150359200,
"expiresAt": 1659742355201
},
"1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657031103463,
"expiresAt": 1659623091422
},
"1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657031104407,
"expiresAt": 1659623091422
},
"1070412|ejs": {
"decision": "ignore",
"madeAt": 1657031105218,
"expiresAt": 1659623091422
},
"1067553|swagger2openapi>better-ajv-errors>jsonpointer": {
"decision": "ignore",
"madeAt": 1657031106033,
"expiresAt": 1659623091422
},
"1067946|swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
"decision": "ignore",
"madeAt": 1657031106961,
"expiresAt": 1659623091422
},
"1068310|widdershins>markdown-it>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1657031107778,
"expiresAt": 1659623091422
},
"1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>widdershins>markdown-it": {
"decision": "ignore",
"madeAt": 1657033986996,
"expiresAt": 1659625980357
},
"1070030|shins>markdown-it": {
"decision": "ignore",
"madeAt": 1657194134001,
"expiresAt": 1659786130822
},
"1068310|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>widdershins>markdown-it>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1657033988077,
"expiresAt": 1659625980357
},
"1068155|shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657033988917,
"expiresAt": 1659625980357
},
"1070260|shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657033989893,
"expiresAt": 1659625980357
},
"1080944|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment": {
"decision": "ignore",
"madeAt": 1657150358341,
"expiresAt": 1659742355201
},
"1080944|@mojaloop/event-sdk>grpc>protobufjs>moment": {
"decision": "ignore",
"madeAt": 1657150358342,
"expiresAt": 1659742355201
},
"1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it": {
"decision": "ignore",
"madeAt": 1657150359200,
"expiresAt": 1659742355201
},
"1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657150360095,
"expiresAt": 1659742355201
},
"1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
"decision": "ignore",
"madeAt": 1657150361888,
"expiresAt": 1659742355201
},
"1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>widdershins>markdown-it": {
"decision": "ignore",
"madeAt": 1657194134001,
"expiresAt": 1659786130822
},
"1068310|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>widdershins>markdown-it>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1657194135373,
"expiresAt": 1659786130822
}
},
"rules": {},
Expand Down
Loading