Skip to content

Commit

Permalink
Generate SBOM from Trivy (#2810)
Browse files Browse the repository at this point in the history
* Fix grype issue

* [automation] Auto-update linters version, help and documentation

* Downgrade grype

* mega-liter-runner ml config

* fix test cases

* [MegaLinter] Apply linters fixes

* trivy sbom

* Trivy SBOM

* trivy sbom call

* trivy SBOM test classes

* sbom cyclonedx

* Fix call to trivy sbom

* JSON output

* jscpd

* [MegaLinter] Apply linters fixes

---------

Co-authored-by: nvuillam <nicolas.vuillamy@ox.security>
Co-authored-by: nvuillam <nvuillam@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 15, 2023
1 parent 2e245cd commit f84e76f
Show file tree
Hide file tree
Showing 45 changed files with 412 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .automation/generated/linter-links-previews.json
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,11 @@
"image": null,
"title": "Redirecting"
},
"trivy-sbom": {
"description": "None",
"image": null,
"title": "Redirecting"
},
"ts-standard": {
"description": "English \u2022 Espan\u0303ol (Latinoame\u0301rica) \u2022 Franc\u0327ais \u2022 Bahasa Indonesia \u2022 Italiano (Italian) \u2022 \u65e5\u672c\u8a9e (Japanese) \u2022 \u1112\u1161\u11ab\u1100\u116e\u11a8\u110b\u1165 (Korean) \u2022 Portugue\u0302s (Brasil) \u2022 \u7b80\u4f53\u4e2d\u6587 (Simplified Chinese) \u2022 \u7e41\u9ad4\u4e2d\u6587 (Taiwanese Mandarin).",
"image": null,
Expand Down
1 change: 1 addition & 0 deletions .github/linters/.jscpd.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"**/megalinter/tests/test_megalinter/mega_linter*",
"**/megalinter/tests/test_megalinter/plugins_test.py*",
"**/megalinter/tests/test_megalinter/config_test.py",
"**/repository_trivy_sbom_test.py",
"**/megalinter/utilstest.py",
"**/*.test.js",
"**/CHANGELOG.md",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-BETA-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ jobs:
"repository_semgrep",
"repository_syft",
"repository_trivy",
"repository_trivy_sbom",
"rst_rst_lint",
"rst_rstcheck",
"rst_rstfmt",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-DEV-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ jobs:
"repository_semgrep",
"repository_syft",
"repository_trivy",
"repository_trivy_sbom",
"rst_rst_lint",
"rst_rstcheck",
"rst_rstfmt",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-RELEASE-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ jobs:
"repository_semgrep",
"repository_syft",
"repository_trivy",
"repository_trivy_sbom",
"rst_rst_lint",
"rst_rstcheck",
"rst_rstfmt",
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,10 @@ RUN curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh |
# trivy installation
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \

# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# sfdx-scanner-apex installation
&& sfdx plugins:install @salesforce/sfdx-scanner \
&& npm cache clean --force || true \
Expand Down
2 changes: 1 addition & 1 deletion docs/descriptors/xml_xmllint.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To apply file formatting you must set `XML_XMLLINT_CLI_LINT_MODE: file` and `XML
| Variable | Description | Default value |
|-----------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|
| XML_XMLLINT_AUTOFORMAT | If set to `true`, it will reformat and reindent the output | `false` |
| XML_XMLLINT_INDENT | The number of indentation spaces when `XML_XMLLINT_AUTOFORMAT` is `true` | ` ` |
| XML_XMLLINT_INDENT | The number of indentation spaces when `XML_XMLLINT_AUTOFORMAT` is `true` | `` |
| XML_XMLLINT_ARGUMENTS | User custom arguments to add in linter CLI call<br/>Ex: `-s --foo "bar"` | |
| XML_XMLLINT_FILTER_REGEX_INCLUDE | Custom regex including filter<br/>Ex: `(src\|lib)` | Include every file |
| XML_XMLLINT_FILTER_REGEX_EXCLUDE | Custom regex excluding filter<br/>Ex: `(test\|examples)` | Exclude no file |
Expand Down
1 change: 1 addition & 0 deletions docs/standalone-linters.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
| REPOSITORY_SEMGREP | oxsecurity/megalinter-only-repository_semgrep:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-repository_semgrep/beta) |
| REPOSITORY_SYFT | oxsecurity/megalinter-only-repository_syft:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-repository_syft/beta) |
| REPOSITORY_TRIVY | oxsecurity/megalinter-only-repository_trivy:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-repository_trivy/beta) |
| REPOSITORY_TRIVY_SBOM | oxsecurity/megalinter-only-repository_trivy_sbom:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-repository_trivy_sbom/beta) |
| RST_RST_LINT | oxsecurity/megalinter-only-rst_rst_lint:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-rst_rst_lint/beta) |
| RST_RSTCHECK | oxsecurity/megalinter-only-rst_rstcheck:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-rst_rstcheck/beta) |
| RST_RSTFMT | oxsecurity/megalinter-only-rst_rstfmt:beta | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/oxsecurity/megalinter-only-rst_rstfmt/beta) |
Expand Down
4 changes: 4 additions & 0 deletions flavors/ci_light/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ RUN wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/m
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

#OTHER__END

################################
Expand Down
1 change: 1 addition & 0 deletions flavors/ci_light/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"REPOSITORY_GRYPE",
"REPOSITORY_SECRETLINT",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"XML_XMLLINT",
"YAML_PRETTIER",
"YAML_YAMLLINT",
Expand Down
4 changes: 4 additions & 0 deletions flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@ ENV KICS_QUERIES_PATH=/opt/kics/assets/queries KICS_LIBRARIES_PATH=/opt/kics/ass
RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# lychee installation
# Managed with COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/

Expand Down
1 change: 1 addition & 0 deletions flavors/cupcake/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"RST_RST_LINT",
"RST_RSTCHECK",
"RST_RSTFMT",
Expand Down
4 changes: 4 additions & 0 deletions flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/documentation/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
# trivy installation
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \

# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/dotnet/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/dotnetweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,10 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
# trivy installation
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \

# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/dotnetweb/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/go/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,10 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/java/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/javascript/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@ RUN curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh |
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/php/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ RUN curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh |
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/python/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"RST_RST_LINT",
"RST_RSTCHECK",
"RST_RSTFMT",
Expand Down
4 changes: 4 additions & 0 deletions flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/ruby/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"RUBY_RUBOCOP",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
Expand Down
4 changes: 4 additions & 0 deletions flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,10 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/rust/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"RUST_CLIPPY",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
Expand Down
4 changes: 4 additions & 0 deletions flavors/salesforce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ RUN echo y|sfdx plugins:install sfdx-hardis \
# trivy installation
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \

# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# sfdx-scanner-apex installation
&& sfdx plugins:install @salesforce/sfdx-scanner \
&& npm cache clean --force || true \
Expand Down
1 change: 1 addition & 0 deletions flavors/salesforce/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SALESFORCE_SFDX_SCANNER_APEX",
"SALESFORCE_SFDX_SCANNER_AURA",
"SALESFORCE_SFDX_SCANNER_LWC",
Expand Down
4 changes: 4 additions & 0 deletions flavors/security/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ RUN curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh |
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# tflint installation
# Managed with COPY --link --from=tflint /usr/local/bin/tflint /usr/bin/

Expand Down
1 change: 1 addition & 0 deletions flavors/security/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"REPOSITORY_SEMGREP",
"REPOSITORY_SYFT",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"TERRAFORM_TFLINT",
"TERRAFORM_TERRASCAN",
"TERRAFORM_TERRAGRUNT"
Expand Down
4 changes: 4 additions & 0 deletions flavors/swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ RUN rc-update add docker boot && rc-service docker start || true \
&& wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/swift/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
4 changes: 4 additions & 0 deletions flavors/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ ENV KICS_QUERIES_PATH=/opt/kics/assets/queries KICS_LIBRARIES_PATH=/opt/kics/ass
RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin


# trivy-sbom installation
# Next line commented because already managed by another linter
# RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin

# vale installation
# Managed with COPY --link --from=vale /bin/vale /bin/vale

Expand Down
1 change: 1 addition & 0 deletions flavors/terraform/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"REPOSITORY_SECRETLINT",
"REPOSITORY_SEMGREP",
"REPOSITORY_TRIVY",
"REPOSITORY_TRIVY_SBOM",
"SNAKEMAKE_LINT",
"SNAKEMAKE_SNAKEFMT",
"SPELL_CSPELL",
Expand Down
Loading

0 comments on commit f84e76f

Please sign in to comment.