From a8cae1652ddde0c4545049e2179a013550d83da7 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.
---
.github/workflows/build.yml | 2 +-
.trunk/trunk.yaml | 6 ++++--
Dockerfile | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f792725..fbe3737 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,8 +19,8 @@ concurrency:
jobs:
build:
+ name: "Build MariaDB"
runs-on: ubuntu-20.04
- if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v1
- uses: docker/setup-qemu-action@v1
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 ea3d231..f3ffe67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@
FROM mariadb:injected-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-mariadb" \
+ org.opencontainers.image.source="https://github.com/benzine-framework/docker-mariadb"
# If healthcheck.sh isn't baked into the underlying image, crash.
RUN which healthcheck.sh