diff --git a/.automation/generated/linters_matrix.json b/.automation/generated/linters_matrix.json index 7d32f7a0765..59f246e5ba5 100644 --- a/.automation/generated/linters_matrix.json +++ b/.automation/generated/linters_matrix.json @@ -52,6 +52,7 @@ "lua_luacheck", "lua_selene", "lua_stylua", + "makefile_checkmake", "markdown_markdownlint", "markdown_markdown_table_formatter", "perl_perlcritic", diff --git a/Dockerfile b/Dockerfile index f35da93b2e1..efafdfa8195 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,7 @@ ARG GO_REVIVE_VERSION RUN GOBIN=/usr/bin go install github.com/mgechev/revive@$GO_REVIVE_VERSION FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform FROM ghcr.io/assignuser/chktex-alpine:latest AS chktex +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM golang:alpine AS dustilock ARG REPOSITORY_DUSTILOCK_VERSION @@ -637,6 +638,7 @@ COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checke COPY --link --from=revive /usr/bin/revive /usr/bin/revive COPY --link --from=kubeconform /kubeconform /usr/bin/ COPY --link --from=chktex /usr/bin/chktex /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=dustilock /usr/bin/dustilock /usr/bin/dustilock COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ @@ -974,6 +976,9 @@ RUN curl --retry 5 --retry-delay 5 -sSL \ # # stylua installation # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/c_cpp/Dockerfile b/flavors/c_cpp/Dockerfile index 820cb7033a1..ed32aa95ffb 100644 --- a/flavors/c_cpp/Dockerfile +++ b/flavors/c_cpp/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -351,6 +352,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -440,6 +442,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/c_cpp/flavor.json b/flavors/c_cpp/flavor.json index 5eca3f62a5a..3f58ee99981 100644 --- a/flavors/c_cpp/flavor.json +++ b/flavors/c_cpp/flavor.json @@ -35,6 +35,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile index 31b31eda59d..0b9de3f4754 100644 --- a/flavors/ci_light/Dockerfile +++ b/flavors/ci_light/Dockerfile @@ -31,6 +31,7 @@ ARG REPOSITORY_TRUFFLEHOG_VERSION=3.91.0 FROM koalaman/shellcheck:${BASH_SHELLCHECK_VERSION} AS shellcheck FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint +FROM mrtazz/checkmake:latest AS checkmake FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog #FROM__END @@ -236,6 +237,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ #COPY__END @@ -267,6 +269,9 @@ ENV JAVA_HOME_17=/usr/lib/jvm/java-17-openjdk # # prettier installation # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # gitleaks installation # Managed with COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ # diff --git a/flavors/ci_light/flavor.json b/flavors/ci_light/flavor.json index 673ca4af5b1..013a58f00db 100644 --- a/flavors/ci_light/flavor.json +++ b/flavors/ci_light/flavor.json @@ -13,6 +13,7 @@ "JSON_JSONLINT", "JSON_V8R", "JSON_PRETTIER", + "MAKEFILE_CHECKMAKE", "REPOSITORY_GIT_DIFF", "REPOSITORY_GITLEAKS", "REPOSITORY_GRYPE", diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index cb72ac95719..476f7c07d3f 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -61,6 +61,7 @@ FROM golang:1-alpine AS revive ARG GO_REVIVE_VERSION RUN GOBIN=/usr/bin go install github.com/mgechev/revive@$GO_REVIVE_VERSION FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM checkmarx/kics:${REPOSITORY_KICS_VERSION} AS kics FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -537,6 +538,7 @@ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=revive /usr/bin/revive /usr/bin/revive COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=kics /app/bin/kics /usr/bin/kics COPY --from=kics /app/bin/assets /usr/bin/assets @@ -724,6 +726,9 @@ RUN curl --retry 5 --retry-delay 5 -sSL \ && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/cupcake/flavor.json b/flavors/cupcake/flavor.json index 3a85e055581..e4841f97dda 100644 --- a/flavors/cupcake/flavor.json +++ b/flavors/cupcake/flavor.json @@ -48,6 +48,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PHP_PHPCS", diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile index 1431d62b5b3..f08850aebde 100644 --- a/flavors/documentation/Dockerfile +++ b/flavors/documentation/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -345,6 +346,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -428,6 +430,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/documentation/flavor.json b/flavors/documentation/flavor.json index 1e48a16a27a..7ee478eeaff 100644 --- a/flavors/documentation/flavor.json +++ b/flavors/documentation/flavor.json @@ -28,6 +28,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile index 95b0e5e2a5a..a09bc431ae7 100644 --- a/flavors/dotnet/Dockerfile +++ b/flavors/dotnet/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -379,6 +380,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -514,6 +516,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/dotnet/flavor.json b/flavors/dotnet/flavor.json index 5013368e886..170767e6403 100644 --- a/flavors/dotnet/flavor.json +++ b/flavors/dotnet/flavor.json @@ -43,6 +43,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", diff --git a/flavors/dotnetweb/Dockerfile b/flavors/dotnetweb/Dockerfile index 22801f609ec..edd2708e231 100644 --- a/flavors/dotnetweb/Dockerfile +++ b/flavors/dotnetweb/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -445,6 +446,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -592,6 +594,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/dotnetweb/flavor.json b/flavors/dotnetweb/flavor.json index 4c1dd2c81fa..60144cc7ae7 100644 --- a/flavors/dotnetweb/flavor.json +++ b/flavors/dotnetweb/flavor.json @@ -49,6 +49,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index bd0560ebedf..52629af0e02 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -57,6 +57,7 @@ FROM golang:1-alpine AS revive ARG GO_REVIVE_VERSION RUN GOBIN=/usr/bin go install github.com/mgechev/revive@$GO_REVIVE_VERSION FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -358,6 +359,7 @@ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=revive /usr/bin/revive /usr/bin/revive COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -449,6 +451,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/go/flavor.json b/flavors/go/flavor.json index b88b331cb97..524d938dd95 100644 --- a/flavors/go/flavor.json +++ b/flavors/go/flavor.json @@ -31,6 +31,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile index c238e4efc91..78fff992a1d 100644 --- a/flavors/java/Dockerfile +++ b/flavors/java/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -360,6 +361,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -515,6 +517,9 @@ RUN curl --retry 5 --retry-delay 5 -sSL \ && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" \ # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/java/flavor.json b/flavors/java/flavor.json index 70d4f33f7c8..a277ca524e9 100644 --- a/flavors/java/flavor.json +++ b/flavors/java/flavor.json @@ -35,6 +35,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index 3043e17f9bf..05a57fd5e56 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -49,6 +49,7 @@ FROM mvdan/shfmt:${BASH_SHFMT_VERSION} AS shfmt FROM hadolint/hadolint:${DOCKERFILE_HADOLINT_VERSION} AS hadolint FROM mstruebing/editorconfig-checker:${EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION} AS editorconfig-checker FROM ghcr.io/yannh/kubeconform:${KUBERNETES_KUBECONFORM_VERSION} AS kubeconform +FROM mrtazz/checkmake:latest AS checkmake FROM yoheimuta/protolint:${PROTOBUF_PROTOLINT_VERSION} AS protolint FROM zricethezav/gitleaks:${REPOSITORY_GITLEAKS_VERSION} AS gitleaks FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog @@ -389,6 +390,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/ COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker COPY --link --from=kubeconform /kubeconform /usr/bin/ +COPY --link --from=checkmake /checkmake /usr/bin/checkmake COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ @@ -476,6 +478,9 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 && \ curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash -s -- -v "v${KUBERNETES_KUBESCAPE_VERSION}" # +# checkmake installation +# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake +# # markdownlint installation # # markdown-table-formatter installation diff --git a/flavors/python/flavor.json b/flavors/python/flavor.json index 8e061e647cf..733346945fd 100644 --- a/flavors/python/flavor.json +++ b/flavors/python/flavor.json @@ -32,6 +32,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/megalinter/descriptors/all_flavors.json b/megalinter/descriptors/all_flavors.json index fbd91e6fb23..910414d2356 100644 --- a/megalinter/descriptors/all_flavors.json +++ b/megalinter/descriptors/all_flavors.json @@ -36,6 +36,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -79,6 +80,7 @@ "JSON_JSONLINT", "JSON_V8R", "JSON_PRETTIER", + "MAKEFILE_CHECKMAKE", "REPOSITORY_GIT_DIFF", "REPOSITORY_GITLEAKS", "REPOSITORY_GRYPE", @@ -144,6 +146,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PHP_PHPCS", @@ -226,6 +229,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -299,6 +303,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", @@ -382,6 +387,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", @@ -481,6 +487,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -546,6 +553,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -741,6 +749,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", diff --git a/megalinter/descriptors/makefile.megalinter-descriptor.yml b/megalinter/descriptors/makefile.megalinter-descriptor.yml index 8af56f1b428..498139565f2 100644 --- a/megalinter/descriptors/makefile.megalinter-descriptor.yml +++ b/megalinter/descriptors/makefile.megalinter-descriptor.yml @@ -33,8 +33,6 @@ linters: - **Configuration file support** via `.checkmake.ini` for project-specific rules - **Detailed error reporting** with line numbers and suggestions - **Build optimization suggestions** improving compilation efficiency - disabled: true - disabled_reason: "Security issues: " name: MAKEFILE_CHECKMAKE linter_url: https://github.com/mrtazz/checkmake linter_repo: https://github.com/mrtazz/checkmake