diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1b621d0fe8..86a04ff8b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ env: GO_VERSION: "1.15" PYTHON_VERSION: "3.9" - NODE_VERSION: "14" + NODE_VERSION: "16" NPM_VERSION: "7" # ---- Docker Namespace ---- diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index ac382540d9..f5446f65d1 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -12,7 +12,7 @@ env: GO_VERSION: "1.15" PYTHON_VERSION: "3.9" - NODE_VERSION: "14" + NODE_VERSION: "16" NPM_VERSION: "7" # ---- Docker Namespace ---- diff --git a/.nvmrc b/.nvmrc index b009dfb9d9..b6a7d89c68 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -lts/* +16 diff --git a/.templates/new-scanner/parser/Dockerfile b/.templates/new-scanner/parser/Dockerfile index 857051eff5..4bef0263f5 100644 --- a/.templates/new-scanner/parser/Dockerfile +++ b/.templates/new-scanner/parser/Dockerfile @@ -12,7 +12,7 @@ COPY --chown=app:app ./parser.js ./parser.js # Additional packages # ARG namespace # ARG baseImageTag -# FROM node:14-alpine as build +# FROM node:16-alpine as build # RUN mkdir -p /home/app # WORKDIR /home/app # COPY package.json package-lock.json ./ diff --git a/hook-sdk/nodejs/Dockerfile b/hook-sdk/nodejs/Dockerfile index c20917a3c3..618f0ee104 100644 --- a/hook-sdk/nodejs/Dockerfile +++ b/hook-sdk/nodejs/Dockerfile @@ -2,12 +2,12 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM node:14-alpine as build +FROM node:16-alpine as build WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:14-alpine +FROM node:16-alpine ARG NODE_ENV RUN addgroup --system --gid 1001 app && adduser app --system --uid 1001 --ingroup app WORKDIR /home/app/hook-wrapper/ diff --git a/hooks/cascading-scans/hook/Dockerfile b/hooks/cascading-scans/hook/Dockerfile index 1552e30e31..8350d34da5 100644 --- a/hooks/cascading-scans/hook/Dockerfile +++ b/hooks/cascading-scans/hook/Dockerfile @@ -4,13 +4,13 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as install +FROM node:16-alpine as install RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/cascading-scans/hook/package-lock.json b/hooks/cascading-scans/hook/package-lock.json index 564ca7b025..ab5e103a55 100644 --- a/hooks/cascading-scans/hook/package-lock.json +++ b/hooks/cascading-scans/hook/package-lock.json @@ -19,7 +19,7 @@ "devDependencies": { "@types/ip-address": "^7.0.0", "@types/lodash": "^4.14.171", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "jest": "^27.0.6", "typescript": "^4.3.5" } @@ -1155,9 +1155,9 @@ } }, "node_modules/@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==" }, "node_modules/@types/prettier": { "version": "2.3.2", @@ -6007,9 +6007,9 @@ } }, "@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==" }, "@types/prettier": { "version": "2.3.2", diff --git a/hooks/cascading-scans/hook/package.json b/hooks/cascading-scans/hook/package.json index 03a392143d..6dcdf7444d 100644 --- a/hooks/cascading-scans/hook/package.json +++ b/hooks/cascading-scans/hook/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@types/ip-address": "^7.0.0", "@types/lodash": "^4.14.171", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "jest": "^27.0.6", "typescript": "^4.3.5" } diff --git a/hooks/finding-post-processing/hook/Dockerfile b/hooks/finding-post-processing/hook/Dockerfile index 3453377890..a53721f94f 100644 --- a/hooks/finding-post-processing/hook/Dockerfile +++ b/hooks/finding-post-processing/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/generic-webhook/hook/Dockerfile b/hooks/generic-webhook/hook/Dockerfile index 3453377890..a53721f94f 100644 --- a/hooks/generic-webhook/hook/Dockerfile +++ b/hooks/generic-webhook/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/notification/hook/Dockerfile b/hooks/notification/hook/Dockerfile index aff41e9471..85d042469d 100644 --- a/hooks/notification/hook/Dockerfile +++ b/hooks/notification/hook/Dockerfile @@ -4,13 +4,13 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as install +FROM node:16-alpine as install RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/notification/hook/package-lock.json b/hooks/notification/hook/package-lock.json index 26768f82c7..c4a76dd6c3 100644 --- a/hooks/notification/hook/package-lock.json +++ b/hooks/notification/hook/package-lock.json @@ -23,7 +23,7 @@ "@types/jest": "^26.0.24", "@types/lodash": "^4.14.171", "@types/mustache": "^4.1.2", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "@types/nodemailer": "^6.4.4", "jest": "^27.0.6", "ts-jest": "^27.0.3" @@ -1208,9 +1208,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==" }, "node_modules/@types/nodemailer": { "version": "6.4.4", @@ -6502,9 +6502,9 @@ "dev": true }, "@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==" }, "@types/nodemailer": { "version": "6.4.4", diff --git a/hooks/notification/hook/package.json b/hooks/notification/hook/package.json index 63f5142122..71fbd95ba0 100644 --- a/hooks/notification/hook/package.json +++ b/hooks/notification/hook/package.json @@ -26,7 +26,7 @@ "@types/jest": "^26.0.24", "@types/lodash": "^4.14.171", "@types/mustache": "^4.1.2", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "@types/nodemailer": "^6.4.4", "jest": "^27.0.6", "ts-jest": "^27.0.3" diff --git a/hooks/persistence-elastic/hook/Dockerfile b/hooks/persistence-elastic/hook/Dockerfile index 3453377890..a53721f94f 100644 --- a/hooks/persistence-elastic/hook/Dockerfile +++ b/hooks/persistence-elastic/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/update-field/hook/Dockerfile b/hooks/update-field/hook/Dockerfile index 3453377890..a53721f94f 100644 --- a/hooks/update-field/hook/Dockerfile +++ b/hooks/update-field/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/package-lock.json b/package-lock.json index f0081f5c42..a7c9dfec2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/jest": "^26.0.24", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "eslint": "^7.31.0", "eslint-config-oclif": "^3.1.0", "eslint-plugin-node": "^11.1.0", @@ -1198,9 +1198,9 @@ } }, "node_modules/@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==", + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -6854,9 +6854,9 @@ } }, "@types/node": { - "version": "14.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", - "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==", + "version": "16.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.19.tgz", + "integrity": "sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index ee67bfd974..cc5bd07b8f 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/jest": "^26.0.24", - "@types/node": "^14.17.5", + "@types/node": "^16.0.0", "eslint": "^7.31.0", "eslint-config-oclif": "^3.1.0", "eslint-plugin-node": "^11.1.0", diff --git a/parser-sdk/nodejs/Dockerfile b/parser-sdk/nodejs/Dockerfile index 9ec956b7cb..58d2551472 100644 --- a/parser-sdk/nodejs/Dockerfile +++ b/parser-sdk/nodejs/Dockerfile @@ -2,12 +2,12 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM node:14-alpine as build +FROM node:16-alpine as build WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:14-alpine +FROM node:16-alpine ARG NODE_ENV RUN addgroup --system --gid 1001 app && adduser app --system --uid 1001 --ingroup app WORKDIR /home/app/parser-wrapper/ diff --git a/scanners/gitleaks/parser/Dockerfile b/scanners/gitleaks/parser/Dockerfile index f6f52f74d9..e087d6a7ac 100644 --- a/scanners/gitleaks/parser/Dockerfile +++ b/scanners/gitleaks/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/ncrack/parser/Dockerfile b/scanners/ncrack/parser/Dockerfile index f6f52f74d9..e087d6a7ac 100644 --- a/scanners/ncrack/parser/Dockerfile +++ b/scanners/ncrack/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/nmap/parser/Dockerfile b/scanners/nmap/parser/Dockerfile index f6f52f74d9..e087d6a7ac 100644 --- a/scanners/nmap/parser/Dockerfile +++ b/scanners/nmap/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/sslyze/parser/Dockerfile b/scanners/sslyze/parser/Dockerfile index f6f52f74d9..e087d6a7ac 100644 --- a/scanners/sslyze/parser/Dockerfile +++ b/scanners/sslyze/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/zap/parser/Dockerfile b/scanners/zap/parser/Dockerfile index f6f52f74d9..e087d6a7ac 100644 --- a/scanners/zap/parser/Dockerfile +++ b/scanners/zap/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:14-alpine as build +FROM node:16-alpine as build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./