From ad49c0c37ee9f7af337b46198d796c6ffce80451 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Fri, 18 Jul 2025 07:54:59 +0200 Subject: [PATCH] Re-enable checkmake --- .github/workflows/deploy-BETA-linters.yml | 1 + .github/workflows/deploy-DEV-linters.yml | 1 + .github/workflows/deploy-RELEASE-linters.yml | 1 + Dockerfile | 5 +++++ flavors/c_cpp/Dockerfile | 5 +++++ flavors/c_cpp/flavor.json | 1 + flavors/ci_light/Dockerfile | 5 +++++ flavors/ci_light/flavor.json | 1 + flavors/cupcake/Dockerfile | 5 +++++ flavors/cupcake/flavor.json | 1 + flavors/documentation/Dockerfile | 5 +++++ flavors/documentation/flavor.json | 1 + flavors/dotnet/Dockerfile | 5 +++++ flavors/dotnet/flavor.json | 1 + flavors/dotnetweb/Dockerfile | 5 +++++ flavors/dotnetweb/flavor.json | 1 + flavors/go/Dockerfile | 5 +++++ flavors/go/flavor.json | 1 + flavors/java/Dockerfile | 5 +++++ flavors/java/flavor.json | 1 + flavors/python/Dockerfile | 5 +++++ flavors/python/flavor.json | 1 + megalinter/descriptors/all_flavors.json | 9 +++++++++ .../descriptors/makefile.megalinter-descriptor.yml | 2 -- 24 files changed, 71 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-BETA-linters.yml b/.github/workflows/deploy-BETA-linters.yml index b84e3a2d438..63f0aa4d522 100644 --- a/.github/workflows/deploy-BETA-linters.yml +++ b/.github/workflows/deploy-BETA-linters.yml @@ -109,6 +109,7 @@ jobs: "lua_luacheck", "lua_selene", "lua_stylua", + "makefile_checkmake", "markdown_markdownlint", "markdown_markdown_table_formatter", "perl_perlcritic", diff --git a/.github/workflows/deploy-DEV-linters.yml b/.github/workflows/deploy-DEV-linters.yml index 56bdb423bc9..911838734e8 100644 --- a/.github/workflows/deploy-DEV-linters.yml +++ b/.github/workflows/deploy-DEV-linters.yml @@ -89,6 +89,7 @@ jobs: "lua_luacheck", "lua_selene", "lua_stylua", + "makefile_checkmake", "markdown_markdownlint", "markdown_markdown_table_formatter", "perl_perlcritic", diff --git a/.github/workflows/deploy-RELEASE-linters.yml b/.github/workflows/deploy-RELEASE-linters.yml index 89647482b02..e837fdd0852 100644 --- a/.github/workflows/deploy-RELEASE-linters.yml +++ b/.github/workflows/deploy-RELEASE-linters.yml @@ -102,6 +102,7 @@ jobs: "lua_luacheck", "lua_selene", "lua_stylua", + "makefile_checkmake", "markdown_markdownlint", "markdown_markdown_table_formatter", "perl_perlcritic", diff --git a/Dockerfile b/Dockerfile index e543cbcd6e6..cd39acc8f55 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 @@ -635,6 +636,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/ @@ -980,6 +982,9 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P # # 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 a477d4d690a..fd73f34f782 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 @@ -349,6 +350,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/ @@ -438,6 +440,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 8b6587fc073..92046cd00a6 100644 --- a/flavors/ci_light/Dockerfile +++ b/flavors/ci_light/Dockerfile @@ -31,6 +31,7 @@ ARG REPOSITORY_TRUFFLEHOG_VERSION=3.90.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 @@ -234,6 +235,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 @@ -265,6 +267,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 1f53d11effc..b622cb25a32 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 @@ -530,6 +531,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 @@ -725,6 +727,9 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P && 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 356c047efbd..a0e713253c5 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 cc9a17890da..a14e35091f3 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 @@ -343,6 +344,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/ @@ -426,6 +428,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 7f4ec56ee7c..80d3d27b40e 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 @@ -377,6 +378,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/ @@ -512,6 +514,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 1d57ba53b02..083685b7cef 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 @@ -443,6 +444,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/ @@ -590,6 +592,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 edc332481b5..4850ecf7092 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 @@ -356,6 +357,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/ @@ -447,6 +449,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 5caf9ce76f7..98f8700ddbf 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 @@ -356,6 +357,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/ @@ -518,6 +520,9 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P && 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 ffc7d74c7da..468ff7d182c 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 @@ -387,6 +388,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/ @@ -474,6 +476,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 3863067d821..c560b6de713 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", @@ -225,6 +228,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -298,6 +302,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", @@ -381,6 +386,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "POWERSHELL_POWERSHELL", @@ -480,6 +486,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -545,6 +552,7 @@ "KUBERNETES_KUBECONFORM", "KUBERNETES_HELM", "KUBERNETES_KUBESCAPE", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", "PROTOBUF_PROTOLINT", @@ -740,6 +748,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 f93bdbb89d7..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: https://github.com/checkmake/checkmake/issues/99" name: MAKEFILE_CHECKMAKE linter_url: https://github.com/mrtazz/checkmake linter_repo: https://github.com/mrtazz/checkmake