From 9a909af0e2d720b856af9e6bdc43147056487362 Mon Sep 17 00:00:00 2001 From: Jannik Hollenbach Date: Sat, 28 Dec 2024 21:40:24 +0100 Subject: [PATCH] Docker is logging warnings about missmatching FROM and AS casing and the ENV declarations = signs Signed-off-by: Jannik Hollenbach --- .templates/new-scanner/parser/Dockerfile | 14 -------------- auto-discovery/cloud-aws/Dockerfile | 2 +- auto-discovery/kubernetes/Dockerfile | 2 +- demo-targets/old-joomla/container/Dockerfile | 2 +- demo-targets/old-wordpress/container/Dockerfile | 2 +- hook-sdk/nodejs/Dockerfile | 4 ++-- hooks/cascading-scans/hook/Dockerfile | 4 ++-- hooks/finding-post-processing/hook/Dockerfile | 2 +- hooks/generic-webhook/hook/Dockerfile | 2 +- hooks/notification/hook/Dockerfile | 4 ++-- hooks/persistence-azure-monitor/hook/Dockerfile | 2 +- hooks/persistence-defectdojo/hook/Dockerfile | 2 +- hooks/persistence-dependencytrack/hook/Dockerfile | 2 +- hooks/persistence-elastic/hook/Dockerfile | 2 +- hooks/update-field-hook/hook/Dockerfile | 2 +- lurker/Dockerfile | 2 +- operator/Dockerfile | 4 ++-- parser-sdk/nodejs/Dockerfile | 4 ++-- scanners/amass/parser/Dockerfile | 2 +- scanners/cmseek/scanner/Dockerfile | 4 ++-- scanners/doggo/parser/Dockerfile | 14 -------------- scanners/ncrack/parser/Dockerfile | 2 +- scanners/nikto/scanner/Dockerfile | 2 +- scanners/nmap/parser/Dockerfile | 2 +- scanners/sslyze/parser/Dockerfile | 2 +- scanners/typo3scan/scanner/Dockerfile | 4 ++-- .../zap-automation-framework/parser/Dockerfile | 2 +- scanners/zap/parser/Dockerfile | 2 +- 28 files changed, 33 insertions(+), 61 deletions(-) diff --git a/.templates/new-scanner/parser/Dockerfile b/.templates/new-scanner/parser/Dockerfile index 30d3cf114d..a881094246 100644 --- a/.templates/new-scanner/parser/Dockerfile +++ b/.templates/new-scanner/parser/Dockerfile @@ -8,17 +8,3 @@ ARG baseImageTag FROM ${namespace:-securecodebox}/parser-sdk-nodejs:${baseImageTag:-latest} WORKDIR /home/app/parser-wrapper/parser/ COPY --chown=app:app ./parser.js ./parser.js - -# Additional packages -# ARG namespace -# ARG baseImageTag -# FROM node:22-alpine as build -# RUN mkdir -p /home/app -# WORKDIR /home/app -# COPY package.json package-lock.json ./ -# RUN npm ci --production -# -# FROM ${namespace:-securecodebox}/parser-sdk-nodejs:${baseImageTag:-latest} -# WORKDIR /home/app/parser-wrapper/parser/ -# COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/ -# COPY --chown=app:app ./parser.js ./parser.js diff --git a/auto-discovery/cloud-aws/Dockerfile b/auto-discovery/cloud-aws/Dockerfile index ab5a30ba82..89540775a9 100644 --- a/auto-discovery/cloud-aws/Dockerfile +++ b/auto-discovery/cloud-aws/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Build the service binary -FROM golang:1.22 as builder +FROM golang:1.22 AS builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/auto-discovery/kubernetes/Dockerfile b/auto-discovery/kubernetes/Dockerfile index 7ab41b30b3..ca22943a73 100644 --- a/auto-discovery/kubernetes/Dockerfile +++ b/auto-discovery/kubernetes/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.22 AS builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/demo-targets/old-joomla/container/Dockerfile b/demo-targets/old-joomla/container/Dockerfile index d3bae0df12..ea279e86b1 100644 --- a/demo-targets/old-joomla/container/Dockerfile +++ b/demo-targets/old-joomla/container/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM alpine:3.13 as base +FROM alpine:3.13 AS base WORKDIR /html RUN apk add wget unzip \ diff --git a/demo-targets/old-wordpress/container/Dockerfile b/demo-targets/old-wordpress/container/Dockerfile index 8cce296128..14fb0399db 100644 --- a/demo-targets/old-wordpress/container/Dockerfile +++ b/demo-targets/old-wordpress/container/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM alpine:3.13 as base +FROM alpine:3.13 AS base RUN apk add wget unzip \ && wget https://downloads.wordpress.org/plugin/sqlite-integration.1.8.1.zip \ && unzip sqlite-integration.1.8.1.zip \ diff --git a/hook-sdk/nodejs/Dockerfile b/hook-sdk/nodejs/Dockerfile index 11f42a7817..97c5668ad5 100644 --- a/hook-sdk/nodejs/Dockerfile +++ b/hook-sdk/nodejs/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM node:22-alpine as build +FROM node:22-alpine AS build WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production @@ -14,5 +14,5 @@ WORKDIR /home/app/hook-wrapper/ COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/ COPY --chown=app:app ./hook-wrapper.js ./hook-wrapper.js USER 1001 -ENV NODE_ENV ${NODE_ENV:-production} +ENV NODE_ENV=${NODE_ENV:-production} ENTRYPOINT ["node", "/home/app/hook-wrapper/hook-wrapper.js"] diff --git a/hooks/cascading-scans/hook/Dockerfile b/hooks/cascading-scans/hook/Dockerfile index 2a0f7bd594..146bfbe675 100644 --- a/hooks/cascading-scans/hook/Dockerfile +++ b/hooks/cascading-scans/hook/Dockerfile @@ -4,13 +4,13 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as install +FROM node:22-alpine AS install RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/finding-post-processing/hook/Dockerfile b/hooks/finding-post-processing/hook/Dockerfile index 76674281ef..7e0527c122 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:22-alpine as build +FROM node:22-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 76674281ef..7e0527c122 100644 --- a/hooks/generic-webhook/hook/Dockerfile +++ b/hooks/generic-webhook/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-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 b37c6ad762..e238e97ef5 100644 --- a/hooks/notification/hook/Dockerfile +++ b/hooks/notification/hook/Dockerfile @@ -4,13 +4,13 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as install +FROM node:22-alpine AS install RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/persistence-azure-monitor/hook/Dockerfile b/hooks/persistence-azure-monitor/hook/Dockerfile index 666e39e385..86d17d8b79 100644 --- a/hooks/persistence-azure-monitor/hook/Dockerfile +++ b/hooks/persistence-azure-monitor/hook/Dockerfile @@ -4,7 +4,7 @@ ARG baseImageTag ARG namespace -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/persistence-defectdojo/hook/Dockerfile b/hooks/persistence-defectdojo/hook/Dockerfile index b880900544..c432cf33c1 100644 --- a/hooks/persistence-defectdojo/hook/Dockerfile +++ b/hooks/persistence-defectdojo/hook/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM gradle:jdk17 as build +FROM gradle:jdk17 AS build COPY . /home/gradle/src WORKDIR /home/gradle/src RUN ./gradlew build -x test diff --git a/hooks/persistence-dependencytrack/hook/Dockerfile b/hooks/persistence-dependencytrack/hook/Dockerfile index 0923bc6f82..72b825bee3 100644 --- a/hooks/persistence-dependencytrack/hook/Dockerfile +++ b/hooks/persistence-dependencytrack/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/persistence-elastic/hook/Dockerfile b/hooks/persistence-elastic/hook/Dockerfile index 76674281ef..7e0527c122 100644 --- a/hooks/persistence-elastic/hook/Dockerfile +++ b/hooks/persistence-elastic/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/hooks/update-field-hook/hook/Dockerfile b/hooks/update-field-hook/hook/Dockerfile index 76674281ef..7e0527c122 100644 --- a/hooks/update-field-hook/hook/Dockerfile +++ b/hooks/update-field-hook/hook/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/lurker/Dockerfile b/lurker/Dockerfile index 510e7a027e..2caaf6d0c6 100644 --- a/lurker/Dockerfile +++ b/lurker/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.22 AS builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/operator/Dockerfile b/operator/Dockerfile index 3ef4cb72e6..f65c25c45a 100644 --- a/operator/Dockerfile +++ b/operator/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.22 AS builder WORKDIR /workspace # Copy the Go Modules manifests @@ -28,7 +28,7 @@ RUN CGO_ENABLED=0 go build -a -o manager main.go FROM gcr.io/distroless/static:nonroot ENV VERSION=unknown -ENV TELEMETRY_ENABLED "true" +ENV TELEMETRY_ENABLED="true" WORKDIR / COPY --from=builder /workspace/manager . diff --git a/parser-sdk/nodejs/Dockerfile b/parser-sdk/nodejs/Dockerfile index 171381d008..54c3c9bce9 100644 --- a/parser-sdk/nodejs/Dockerfile +++ b/parser-sdk/nodejs/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM node:22-alpine as build +FROM node:22-alpine AS build WORKDIR /home/app COPY package.json package-lock.json ./ RUN npm ci --production @@ -16,5 +16,5 @@ COPY --chown=app:app ./parser-wrapper.js ./parser-wrapper.js COPY --chown=app:app ./parser-utils.js ./parser-utils.js COPY --chown=app:app ./findings-schema.json ./findings-schema.json USER 1001 -ENV NODE_ENV ${NODE_ENV:-production} +ENV NODE_ENV=${NODE_ENV:-production} ENTRYPOINT ["node", "/home/app/parser-wrapper/parser-wrapper.js"] diff --git a/scanners/amass/parser/Dockerfile b/scanners/amass/parser/Dockerfile index 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/amass/parser/Dockerfile +++ b/scanners/amass/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/cmseek/scanner/Dockerfile b/scanners/cmseek/scanner/Dockerfile index 8eef6f8b7c..c69f092e9a 100644 --- a/scanners/cmseek/scanner/Dockerfile +++ b/scanners/cmseek/scanner/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Base Image -FROM python:3.9-alpine as base +FROM python:3.9-alpine AS base ARG scannerVersion # Install git and Clone Repo RUN apk add git \ @@ -12,7 +12,7 @@ RUN apk add git \ && rm -r .git # Runtime Image -FROM python:3.9-alpine as runtime +FROM python:3.9-alpine AS runtime # Create cmseek user/group and give access RUN addgroup --system --gid 1001 cmseek && adduser cmseek --system --uid 1001 --ingroup cmseek diff --git a/scanners/doggo/parser/Dockerfile b/scanners/doggo/parser/Dockerfile index 30d3cf114d..a881094246 100644 --- a/scanners/doggo/parser/Dockerfile +++ b/scanners/doggo/parser/Dockerfile @@ -8,17 +8,3 @@ ARG baseImageTag FROM ${namespace:-securecodebox}/parser-sdk-nodejs:${baseImageTag:-latest} WORKDIR /home/app/parser-wrapper/parser/ COPY --chown=app:app ./parser.js ./parser.js - -# Additional packages -# ARG namespace -# ARG baseImageTag -# FROM node:22-alpine as build -# RUN mkdir -p /home/app -# WORKDIR /home/app -# COPY package.json package-lock.json ./ -# RUN npm ci --production -# -# FROM ${namespace:-securecodebox}/parser-sdk-nodejs:${baseImageTag:-latest} -# WORKDIR /home/app/parser-wrapper/parser/ -# COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/ -# COPY --chown=app:app ./parser.js ./parser.js diff --git a/scanners/ncrack/parser/Dockerfile b/scanners/ncrack/parser/Dockerfile index 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/ncrack/parser/Dockerfile +++ b/scanners/ncrack/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/nikto/scanner/Dockerfile b/scanners/nikto/scanner/Dockerfile index 62244d7f41..9e0e587941 100644 --- a/scanners/nikto/scanner/Dockerfile +++ b/scanners/nikto/scanner/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM alpine:3.14 as build +FROM alpine:3.14 AS build ARG scannerVersion RUN apk add git RUN git clone --depth 1 https://github.com/sullo/nikto.git /nikto diff --git a/scanners/nmap/parser/Dockerfile b/scanners/nmap/parser/Dockerfile index 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/nmap/parser/Dockerfile +++ b/scanners/nmap/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-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 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/sslyze/parser/Dockerfile +++ b/scanners/sslyze/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./ diff --git a/scanners/typo3scan/scanner/Dockerfile b/scanners/typo3scan/scanner/Dockerfile index 66ee7c2ac8..b375d9640a 100644 --- a/scanners/typo3scan/scanner/Dockerfile +++ b/scanners/typo3scan/scanner/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # Base Image -FROM python:3.9-alpine as base +FROM python:3.9-alpine AS base ARG scannerVersion # Install git and Clone Repo RUN apk add git \ @@ -12,7 +12,7 @@ RUN apk add git \ && rm -r .git .github doc # Runtime Image -FROM python:3.9-alpine as runtime +FROM python:3.9-alpine AS runtime # Create typo3scan user/group and give access RUN addgroup --system --gid 1001 typo3scan && adduser typo3scan --system --uid 1001 --ingroup typo3scan diff --git a/scanners/zap-automation-framework/parser/Dockerfile b/scanners/zap-automation-framework/parser/Dockerfile index 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/zap-automation-framework/parser/Dockerfile +++ b/scanners/zap-automation-framework/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-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 184c4f3d81..2a9a95cd0e 100644 --- a/scanners/zap/parser/Dockerfile +++ b/scanners/zap/parser/Dockerfile @@ -4,7 +4,7 @@ ARG namespace ARG baseImageTag -FROM node:22-alpine as build +FROM node:22-alpine AS build RUN mkdir -p /home/app WORKDIR /home/app COPY package.json package-lock.json ./