Fettling.

This commit is contained in:
Greyscale 2024-05-17 11:19:40 +02:00
parent a0468ff636
commit a8cae1652d
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
3 changed files with 7 additions and 5 deletions
.github/workflows
.trunk
Dockerfile

View file

@ -19,8 +19,8 @@ concurrency:
jobs: jobs:
build: build:
name: "Build MariaDB"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: docker/setup-qemu-action@v1 - uses: docker/setup-qemu-action@v1

View file

@ -17,6 +17,10 @@ runtimes:
- python@3.10.8 - python@3.10.8
# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
lint: lint:
disabled:
- trufflehog # Trufflehog duplicates gitleaks functionality.
- terrascan
- trivy
enabled: enabled:
- gitleaks@8.18.2 - gitleaks@8.18.2
- markdownlint@0.40.0 - markdownlint@0.40.0
@ -25,8 +29,6 @@ lint:
- checkov@3.2.92 - checkov@3.2.92
- git-diff-check - git-diff-check
- prettier@3.2.5 - prettier@3.2.5
- trivy@0.51.1
- trufflehog@3.76.2
- yamllint@1.35.1 - yamllint@1.35.1
definitions: definitions:
- name: markdownlint - name: markdownlint

View file

@ -2,8 +2,8 @@
FROM mariadb:injected-version FROM mariadb:injected-version
LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \ LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
org.label-schema.vcs-url="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" org.opencontainers.image.source="https://github.com/benzine-framework/docker-mariadb"
# If healthcheck.sh isn't baked into the underlying image, crash. # If healthcheck.sh isn't baked into the underlying image, crash.
RUN which healthcheck.sh RUN which healthcheck.sh