From b7f41d7659aa5c036c05d943fae69c1e2d654b6b 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.mariadb  | 5 +++++
 Dockerfile.postgres | 5 +++++
 Dockerfile.traptest | 7 ++++++-
 4 files changed, 20 insertions(+), 3 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.mariadb b/Dockerfile.mariadb
index 1be4324..2bd2796 100644
--- a/Dockerfile.mariadb
+++ b/Dockerfile.mariadb
@@ -1,5 +1,10 @@
 ARG MARIADB_VERSION
 FROM mariadb:$MARIADB_VERSION AS mariadb
+
+LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
+      org.label-schema.vcs-url="https://github.com/benzine-framework/docker-s3db" \
+      org.opencontainers.image.source="https://github.com/benzine-framework/docker-s3db"
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV DEBIAN_FRONTEND="teletype" \
     TERM=xterm-256color \
diff --git a/Dockerfile.postgres b/Dockerfile.postgres
index 0c0f4f3..25ac0c1 100644
--- a/Dockerfile.postgres
+++ b/Dockerfile.postgres
@@ -1,5 +1,10 @@
 ARG PGSQL_VERSION
 FROM postgres:$PGSQL_VERSION-alpine AS postgres
+
+LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
+      org.label-schema.vcs-url="https://github.com/benzine-framework/docker-s3db" \
+      org.opencontainers.image.source="https://github.com/benzine-framework/docker-s3db"
+
 RUN apk add --no-cache runit && \
     apk --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/main add \
       icu-libs \
diff --git a/Dockerfile.traptest b/Dockerfile.traptest
index daf830e..97d5af9 100644
--- a/Dockerfile.traptest
+++ b/Dockerfile.traptest
@@ -1,6 +1,11 @@
 FROM ubuntu:jammy AS mariadb-traptest
+
+LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
+      org.label-schema.vcs-url="https://github.com/benzine-framework/docker-s3db" \
+      org.opencontainers.image.source="https://github.com/benzine-framework/docker-s3db"
+
 COPY traptest.sh /usr/local/bin/traptest
 RUN chmod +x /usr/local/bin/traptest
 ENTRYPOINT ["/usr/local/bin/traptest"]
 CMD []
-STOPSIGNAL SIGINT
\ No newline at end of file
+STOPSIGNAL SIGINT