Skip to content

build: move node version to ARG #722

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

Closed
nigthknight wants to merge 1 commit into from
Closed

build: move node version to ARG #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ GIT_TAG ?= $$(git rev-parse --short HEAD)
BASE_IMG_TAG ?= latest
IMG_TAG ?= "sha-$(GIT_TAG)"
JEST_VERSION ?= latest
NODE_VERSION ?= 14

parser-prefix = parser
scanner-prefix = scanner
Expand Down Expand Up @@ -93,6 +94,7 @@ common-docker-build:
--build-arg=scannerVersion=$(shell yq e .appVersion ./Chart.yaml) \
--build-arg=baseImageTag=$(BASE_IMG_TAG) \
--build-arg=namespace=$(IMG_NS) \
--build-arg=NODE_VERSION=$(NODE_VERSION) \
-t $(IMG_NS)/$(module)-$(name):$(IMG_TAG) \
-f ./$(module)/Dockerfile \
./$(module)
Expand Down
6 changes: 3 additions & 3 deletions hook-sdk/nodejs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# SPDX-FileCopyrightText: 2021 iteratec GmbH
#
# SPDX-License-Identifier: Apache-2.0

FROM node:14-alpine as build
ARG NODE_VERSION
FROM node:${NODE_VERSION}-alpine as build
WORKDIR /home/app
COPY package.json package-lock.json ./
RUN npm ci --production

FROM node:14-alpine
FROM node:${NODE_VERSION}-alpine
ARG NODE_ENV
RUN addgroup --system --gid 1001 app && adduser app --system --uid 1001 --ingroup app
WORKDIR /home/app/hook-wrapper/
Expand Down
4 changes: 2 additions & 2 deletions hooks/cascading-scans/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as install
FROM node:${NODE_VERSION}-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:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion hooks/finding-post-processing/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion hooks/generic-webhook/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
4 changes: 2 additions & 2 deletions hooks/notification/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as install
FROM node:${NODE_VERSION}-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:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion hooks/persistence-elastic/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion hooks/update-field/hook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
6 changes: 3 additions & 3 deletions parser-sdk/nodejs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# SPDX-FileCopyrightText: 2021 iteratec GmbH
#
# SPDX-License-Identifier: Apache-2.0

FROM node:14-alpine as build
ARG NODE_VERSION
FROM node:${NODE_VERSION}-alpine as build
WORKDIR /home/app
COPY package.json package-lock.json ./
RUN npm ci --production

FROM node:14-alpine
FROM node:${NODE_VERSION}-alpine
ARG NODE_ENV
RUN addgroup --system --gid 1001 app && adduser app --system --uid 1001 --ingroup app
WORKDIR /home/app/parser-wrapper/
Expand Down
2 changes: 1 addition & 1 deletion scanners/gitleaks/parser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion scanners/ncrack/parser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion scanners/nmap/parser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion scanners/sslyze/parser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion scanners/zap/parser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ARG namespace
ARG baseImageTag
FROM node:14-alpine as build
FROM node:${NODE_VERSION}-alpine as build
RUN mkdir -p /home/app
WORKDIR /home/app
COPY package.json package-lock.json ./
Expand Down
2 changes: 1 addition & 1 deletion sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include ../../common.mk

docker-build-sdk:
@echo ".: ⚙️ Build '$(name)'."
docker build -t $(IMG_NS)/$(name)-nodejs:$(IMG_TAG) .
docker build -t $(IMG_NS)/$(name)-nodejs:$(IMG_TAG) --build-arg=NODE_VERSION=$(NODE_VERSION) .

docker-export-sdk:
@echo ".: ⚙️ Build '$(name)'."
Expand Down