From 42829ea0123fb7bd90301f4ed6cfbb8fac45f34e Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Fri, 17 May 2024 11:19:40 +0200
Subject: [PATCH] Fettling.
---
.trunk/trunk.yaml | 6 ++++--
Dockerfile | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
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 e8106ff..78a8783 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@ ARG BUILD_DATE
ARG GIT_SHA
ARG MITM_VERSION
LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
- 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-mitmproxy" \
+ org.opencontainers.image.source="https://github.com/benzine-framework/docker-mitmproxy" \
org.opencontainers.image.title="mitm-proxy with healthcheck" \
org.opencontainers.image.created="${BUILD_DATE}" \
org.opencontainers.image.version="${MITM_VERSION}" \