Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
bdovaz committed Jan 27, 2025
1 parent 011760a commit 0da6ff3
Show file tree
Hide file tree
Showing 64 changed files with 135 additions and 103 deletions.
51 changes: 17 additions & 34 deletions .automation/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
from megalinter.constants import (
DEFAULT_DOCKERFILE_ARGS,
DEFAULT_DOCKERFILE_APK_PACKAGES,
DEFAULT_DOCKERFILE_DOCKER_ARGS,
DEFAULT_DOCKERFILE_DOCKER_APK_PACKAGES,
DEFAULT_DOCKERFILE_NPM_ARGS,
DEFAULT_DOCKERFILE_NPM_APK_PACKAGES,
DEFAULT_DOCKERFILE_GEM_ARGS,
DEFAULT_DOCKERFILE_GEM_APK_PACKAGES,
DEFAULT_DOCKERFILE_FLAVOR_ARGS,
DEFAULT_DOCKERFILE_FLAVOR_CARGO_PACKAGES,
DEFAULT_RELEASE,
DEFAULT_REPORT_FOLDER_NAME,
ML_DOC_URL_BASE,
Expand Down Expand Up @@ -280,10 +288,8 @@ def generate_flavor(flavor, flavor_info):
requires_docker,
flavor,
extra_lines,
[
"# renovate: datasource=crate depName=sarif-fmt\nARG CARGO_SARIF_FMT_VERSION=0.7.0"
],
{"cargo": ["sarif-fmt@${CARGO_SARIF_FMT_VERSION}"]},
DEFAULT_DOCKERFILE_FLAVOR_ARGS.copy(),
{"cargo": DEFAULT_DOCKERFILE_FLAVOR_CARGO_PACKAGES.copy()},
)


Expand Down Expand Up @@ -315,14 +321,8 @@ def build_dockerfile(
is_docker_other_run = False
# Manage docker
if requires_docker is True:
docker_arg += [
"# renovate: datasource=repology depName=alpine_3_21/docker\nARG APK_DOCKER_VERSION=27.3.1-r0",
"# renovate: datasource=repology depName=alpine_3_21/openrc\nARG APK_OPENRC_VERSION=0.55.1-r2",
]
apk_packages += [
"docker=${APK_DOCKER_VERSION}",
"openrc=${APK_OPENRC_VERSION}"
]
docker_arg += DEFAULT_DOCKERFILE_DOCKER_ARGS.copy()
apk_packages += DEFAULT_DOCKERFILE_DOCKER_APK_PACKAGES.copy()
docker_other += [
"RUN rc-update add docker boot && (rc-service docker start || true)"
]
Expand Down Expand Up @@ -435,29 +435,12 @@ def build_dockerfile(
cargo_packages += item["install"]["cargo"]
# Add node install if node packages are here
if len(npm_packages) > 0:
docker_arg += [
"# renovate: datasource=repology depName=alpine_3_21/npm\nARG APK_NPM_VERSION=10.9.1-r0",
"# renovate: datasource=repology depName=alpine_3_21/nodejs-current\nARG APK_NODEJS_CURRENT_VERSION=23.2.0-r1",
"# renovate: datasource=repology depName=alpine_3_21/yarn\nARG APK_YARN_VERSION=1.22.22-r1",
]
apk_packages += [
"npm=${APK_NPM_VERSION}",
"nodejs-current=${APK_NODEJS_CURRENT_VERSION}",
"yarn=${APK_YARN_VERSION}"
]
docker_arg += DEFAULT_DOCKERFILE_NPM_ARGS.copy()
apk_packages += DEFAULT_DOCKERFILE_NPM_APK_PACKAGES.copy()
# Add ruby apk packages if gem packages are here
if len(gem_packages) > 0:
docker_arg += [
"# renovate: datasource=repology depName=alpine_3_21/ruby\nARG APK_RUBY_VERSION=3.3.6-r0",
"# renovate: datasource=repology depName=alpine_3_21/ruby-dev\nARG APK_RUBY_DEV_VERSION=3.3.6-r0",
"# renovate: datasource=repology depName=alpine_3_21/ruby-bundler\nARG APK_RUBY_BUNDLER_VERSION=2.5.23-r0",
"# renovate: datasource=repology depName=alpine_3_21/ruby-rdoc\nARG APK_RUBY_RDOC_VERSION=3.3.6-r0",
]
apk_packages += [
"ruby=${APK_RUBY_VERSION}",
"ruby-dev=${APK_RUBY_DEV_VERSION}",
"ruby-bundler=${APK_RUBY_BUNDLER_VERSION}",
"ruby-rdoc=${APK_RUBY_RDOC_VERSION}"]
docker_arg += DEFAULT_DOCKERFILE_GEM_ARGS.copy()
apk_packages += DEFAULT_DOCKERFILE_GEM_APK_PACKAGES.copy()
# Separate args used in FROM instructions from others
all_from_instructions = "\n".join(list(dict.fromkeys(docker_from)))
docker_arg_top = []
Expand Down Expand Up @@ -557,7 +540,7 @@ def build_dockerfile(
"WORKDIR /node-deps\n"
+ "RUN npm --no-cache install --ignore-scripts --omit=dev \\\n "
+ " \\\n ".join(list(dict.fromkeys(npm_packages)))
+ " && \\\n"
+ " && \\\n"
# + ' echo "Fixing audit issues with npm…" \\\n'
# + " && npm audit fix --audit-level=critical || true \\\n" # Deactivated for now
+ ' echo "Cleaning npm cache…" \\\n'
Expand Down
3 changes: 2 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,7 @@
"remarkrc",
"remoting",
"replicatedhq",
"repology",
"repos",
"reqparse",
"reqs",
Expand Down Expand Up @@ -1566,4 +1567,4 @@
"zaach",
"zricethezav"
]
}
}
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ ARG GO_REVIVE_VERSION=v1.6.0
ARG KUBERNETES_KUBECONFORM_VERSION=v0.6.7-alpine
# renovate: datasource=docker depName=yoheimuta/protolint
ARG PROTOBUF_PROTOLINT_VERSION=0.52.0
# renovate: datasource=repology depName=alpine_3_21/git-sdk
ARG APK_GIT_VERSION=2.47.2-r0
# renovate: datasource=github-tags depName=checkmarx/dustilock
ARG REPOSITORY_DUSTILOCK_VERSION=1.2.0
# renovate: datasource=docker depName=zricethezav/gitleaks
Expand Down Expand Up @@ -145,7 +143,6 @@ ARG POWERSHELL_VERSION=7.4.6

# renovate: datasource=github-tags depName=sgerrand/alpine-pkg-glibc
ARG ALPINE_GLIBC_PACKAGE_VERSION=2.34-r0

# renovate: datasource=repology depName=alpine_3_21/dotnet9-sdk
ARG APK_DOTNET9_SDK_VERSION=9.0.102-r0
# renovate: datasource=repology depName=alpine_3_21/go
Expand Down Expand Up @@ -673,7 +670,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
prettyjson@${NPM_PRETTYJSON_VERSION} \
@typescript-eslint/eslint-plugin@${NPM_TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION} \
@typescript-eslint/parser@${NPM_TYPESCRIPT_ESLINT_PARSER_VERSION} \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down Expand Up @@ -1255,6 +1252,10 @@ RUN curl -sSfL https://raw.githubusercontent.com/anchore/syft/refs/tags/v${REPOS
# ENV PATH="${PATH}:/root/.dotnet/tools"
&& dotnet tool install --global TSQLLint --version ${SQL_TSQLLINT_VERSION}
#
# swiftlint installation
# renovate: datasource=docker depName=ghcr.io/realm/swiftlint
ENV SWIFT_SWIFTLINT_VERSION=0.58.2
#
# tekton-lint installation
#
# tflint installation
Expand Down
2 changes: 1 addition & 1 deletion flavors/c_cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/ci_light/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@ls-lint/ls-lint@${NPM_LS_LINT_LS_LINT_VERSION} \
secretlint@${NPM_SECRETLINT_VERSION} \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} && \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
7 changes: 5 additions & 2 deletions flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ ARG APK_DOCKER_VERSION=27.3.1-r0
ARG APK_OPENRC_VERSION=0.55.1-r2
# renovate: datasource=github-tags depName=sgerrand/alpine-pkg-glibc
ARG ALPINE_GLIBC_PACKAGE_VERSION=2.34-r0

# renovate: datasource=repology depName=alpine_3_21/go
ARG APK_GO_VERSION=1.23.5-r0
# renovate: datasource=repology depName=alpine_3_21/openjdk21
Expand Down Expand Up @@ -543,7 +542,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
prettyjson@${NPM_PRETTYJSON_VERSION} \
@typescript-eslint/eslint-plugin@${NPM_TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION} \
@typescript-eslint/parser@${NPM_TYPESCRIPT_ESLINT_PARSER_VERSION} \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down Expand Up @@ -886,6 +885,10 @@ RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/
#
# sqlfluff installation
#
# swiftlint installation
# renovate: datasource=docker depName=ghcr.io/realm/swiftlint
ENV SWIFT_SWIFTLINT_VERSION=0.58.2
#
# tflint installation
# Managed with COPY --link --from=tflint /usr/local/bin/tflint /usr/bin/
#
Expand Down
2 changes: 1 addition & 1 deletion flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnetweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
prettyjson@${NPM_PRETTYJSON_VERSION} \
@typescript-eslint/eslint-plugin@${NPM_TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION} \
@typescript-eslint/parser@${NPM_TYPESCRIPT_ESLINT_PARSER_VERSION} \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/formatters/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
typescript@${NPM_TYPESCRIPT_VERSION} \
prettier@${NPM_PRETTIER_VERSION} \
markdownlint-cli@${NPM_MARKDOWNLINT_CLI_VERSION} \
markdown-table-formatter@{NPM_MARKDOWN_TABLE_FORMATTER_VERSION} && \
markdown-table-formatter@{NPM_MARKDOWN_TABLE_FORMATTER_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
3 changes: 1 addition & 2 deletions flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ ARG APK_OPENSSH_VERSION=9.9_p1-r2
ARG CARGO_SARIF_FMT_VERSION=0.7.0
# renovate: datasource=github-tags depName=sgerrand/alpine-pkg-glibc
ARG ALPINE_GLIBC_PACKAGE_VERSION=2.34-r0

# renovate: datasource=repology depName=alpine_3_21/openjdk21
ARG APK_OPENJDK21_VERSION=21.0.5_p11-r0
# renovate: datasource=repology depName=alpine_3_21/py3-pyflakes
Expand Down Expand Up @@ -345,7 +344,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
prettyjson@${NPM_PRETTYJSON_VERSION} \
@typescript-eslint/eslint-plugin@${NPM_TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION} \
@typescript-eslint/parser@${NPM_TYPESCRIPT_ESLINT_PARSER_VERSION} \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
ts-standard@${NPM_TS_STANDARD_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion flavors/salesforce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
4 changes: 1 addition & 3 deletions flavors/security/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ ARG BASH_SHELLCHECK_VERSION=v0.10.0
ARG DOCKERFILE_HADOLINT_VERSION=v2.12.0-alpine
# renovate: datasource=docker depName=ghcr.io/yannh/kubeconform
ARG KUBERNETES_KUBECONFORM_VERSION=v0.6.7-alpine
# renovate: datasource=repology depName=alpine_3_21/git-sdk
ARG APK_GIT_VERSION=2.47.2-r0
# renovate: datasource=github-tags depName=checkmarx/dustilock
ARG REPOSITORY_DUSTILOCK_VERSION=1.2.0
# renovate: datasource=docker depName=zricethezav/gitleaks
Expand Down Expand Up @@ -241,7 +239,7 @@ WORKDIR /node-deps
RUN npm --no-cache install --ignore-scripts --omit=dev \
secretlint@${NPM_SECRETLINT_VERSION} \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} && \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
6 changes: 5 additions & 1 deletion flavors/swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down Expand Up @@ -518,6 +518,10 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
#
# sqlfluff installation
#
# swiftlint installation
# renovate: datasource=docker depName=ghcr.io/realm/swiftlint
ENV SWIFT_SWIFTLINT_VERSION=0.58.2
#
# tekton-lint installation
#
# xmllint installation
Expand Down
2 changes: 1 addition & 1 deletion flavors/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ RUN npm --no-cache install --ignore-scripts --omit=dev \
@secretlint/secretlint-rule-preset-recommend@${NPM_SECRETLINT_SECRETLINT_RULE_PRESET_RECOMMEND_VERSION} \
@secretlint/secretlint-formatter-sarif@${NPM_SECRETLINT_SECRETLINT_FORMATTER_SARIF_VERSION} \
cspell@${NPM_CSPELL_VERSION} \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
@ibm/tekton-lint@${NPM_IBM_TEKTON_LINT_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
2 changes: 1 addition & 1 deletion linters/api_spectral/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ ENV NODE_OPTIONS="--max-old-space-size=8192" \
#NPM__START
WORKDIR /node-deps
RUN npm --no-cache install --ignore-scripts --omit=dev \
@stoplight/spectral-cli@${NPM_SPECTRAL_CLI_VERSION} && \
@stoplight/spectral-cli@${NPM_SPECTRAL_CLI_VERSION} && \
echo "Cleaning npm cache…" \
&& (npm cache clean --force || true) \
&& echo "Changing owner of node_modules files…" \
Expand Down
1 change: 0 additions & 1 deletion linters/clojure_clj_kondo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ ARG APK_MUSL_DEV_VERSION=1.2.5-r8
ARG APK_OPENSSH_VERSION=9.9_p1-r2
# renovate: datasource=github-tags depName=sgerrand/alpine-pkg-glibc
ARG ALPINE_GLIBC_PACKAGE_VERSION=2.34-r0

# renovate: datasource=github-tags depName=clj-kondo/clj-kondo
ARG CLJ_KONDO_VERSION=2025.01.16

Expand Down
1 change: 0 additions & 1 deletion linters/clojure_cljstyle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ ARG APK_MUSL_DEV_VERSION=1.2.5-r8
ARG APK_OPENSSH_VERSION=9.9_p1-r2
# renovate: datasource=github-tags depName=sgerrand/alpine-pkg-glibc
ARG ALPINE_GLIBC_PACKAGE_VERSION=2.34-r0

# renovate: datasource=github-tags depName=greglook/cljstyle
ARG CLJ_STYLE_VERSION=0.17.642
#ARG__END
Expand Down
Loading

0 comments on commit 0da6ff3

Please sign in to comment.