diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index e8e8202..9d2fc85 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -41,7 +41,7 @@ jobs: - "20.9.0" - "21.6.1" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v2 diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e98156c..2035a9b 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -17,6 +17,10 @@ runtimes: - python@3.10.8 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: + disabled: + - trufflehog # Trufflehog duplicates gitleaks functionality. + - terrascan + - trivy enabled: - gitleaks@8.18.2 - markdownlint@0.40.0 @@ -25,8 +29,6 @@ lint: - checkov@3.2.92 - git-diff-check - prettier@3.2.5 - - trivy@0.51.1 - - trufflehog@3.76.2 - yamllint@1.35.1 definitions: - name: markdownlint diff --git a/Dockerfile b/Dockerfile index cc088a8..2f4fdd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM marshall:build AS nodejs LABEL maintainer="Matthew Baggett " \ - org.label-schema.vcs-url="https://github.com/benzine-framework/docker" \ - org.opencontainers.image.source="https://github.com/benzine-framework/docker" + org.label-schema.vcs-url="https://github.com/benzine-framework/docker-node" \ + org.opencontainers.image.source="https://github.com/benzine-framework/docker-node" ARG NODE_VERSION ARG YARN_VERSION