Formatting fixup

.github/workflows/build.yml

@@ -53,7 +53,6 @@ jobs:
           docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: "Setup: Login to Private Registry"
-        if: secrets.PRIVATE_REGISTRY
         uses: docker/login-action@v3
         with:
           registry: ${{ secrets.PRIVATE_REGISTRY }}

Dockerfile.mariadb

@@ -1,3 +1,4 @@
+# checkov:skip=CKV_DOCKER_3 If its good enough for upstream mariadb, its good enough for me.
 ARG MARIADB_VERSION
 FROM mariadb:$MARIADB_VERSION AS mariadb
 

Dockerfile.postgres

@@ -1,3 +1,4 @@
+# checkov:skip=CKV_DOCKER_3 If its good enough for upstream postgres, its good enough for me.
 ARG PGSQL_VERSION
 FROM postgres:$PGSQL_VERSION-alpine AS postgres
 
@@ -13,8 +14,13 @@ RUN apk add --no-cache runit && \
     # Current packages don't exist in other repositories
     libavif \
     && \
-    apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted gnu-libiconv \
+    apk \
+        --no-cache \
+        --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
+        #--allow-untrusted \
+        add \
             # Packages \
+            gnu-libiconv \
             nano \
             curl \
             tini \

Dockerfile.traptest

@@ -1,3 +1,4 @@
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
 FROM ubuntu:jammy AS mariadb-traptest
 
 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
@@ -8,4 +9,5 @@ COPY traptest.sh /usr/local/bin/traptest
 RUN chmod +x /usr/local/bin/traptest
 ENTRYPOINT ["/usr/local/bin/traptest"]
 CMD []
+HEALTHCHECK NONE # Healthchecks are not relevant for this image
 STOPSIGNAL SIGINT

README.md

@@ -10,30 +10,32 @@ Every 600 seconds after that, it dumps the database and persists it to s3 if the
 This is extremely not meant for production workloads or anything you want to keep. QA systems, silly side projects, anything you don't want to pay Bezos for RDS for.
 On that note, please consider using Minio or any other S3 provider than AWS.
 
-## Configuration:
+## Configuration
 
 ### MariaDB
+
 ```yaml
-      MARIADB_RANDOM_ROOT_PASSWORD: "yes"
-      MARIADB_USER: example
-      MARIADB_PASSWORD: changeme
-      MARIADB_DATABASE: s3db
-      S3_ENDPOINT: http://minio:9000/
-      S3_API_KEY: <<secret>>
-      S3_API_SECRET: <<secret>>
-      S3_USE_PATH_STYLE_ENDPOINT: "yes" # This is only strictly neccisary with Minio, maybe others. 
-      S3_BUCKET: "s3db"
-      S3_PREFIX: "test/mariadb/"
+MARIADB_RANDOM_ROOT_PASSWORD: "yes"
+MARIADB_USER: example
+MARIADB_PASSWORD: changeme
+MARIADB_DATABASE: s3db
+S3_ENDPOINT: http://minio:9000/
+S3_API_KEY: <<secret>>
+S3_API_SECRET: <<secret>>
+S3_USE_PATH_STYLE_ENDPOINT: "yes" # This is only strictly neccisary with Minio, maybe others.
+S3_BUCKET: "s3db"
+S3_PREFIX: "test/mariadb/"
 ```
 
 ### Postgres
+
 ```yaml
-      POSTGRES_USER: example
-      POSTGRES_PASSWORD: changeme
-      S3_ENDPOINT: http://minio:9000/
-      S3_API_KEY: <<secret>>
-      S3_API_SECRET: <<secret>>
-      S3_USE_PATH_STYLE_ENDPOINT: "yes" # This is only strictly neccisary with Minio, maybe others. 
-      S3_BUCKET: "s3db"
-      S3_PREFIX: "test/postgres/"
+POSTGRES_USER: example
+POSTGRES_PASSWORD: changeme
+S3_ENDPOINT: http://minio:9000/
+S3_API_KEY: <<secret>>
+S3_API_SECRET: <<secret>>
+S3_USE_PATH_STYLE_ENDPOINT: "yes" # This is only strictly neccisary with Minio, maybe others.
+S3_BUCKET: "s3db"
+S3_PREFIX: "test/postgres/"
 ```

TODO.md

@@ -1,5 +0,0 @@
-All:
-
-PostgreSQL:
- 
-MariaDB:

docker-compose.yml

@@ -14,7 +14,7 @@ services:
       MINIO_ROOT_USER: &s3_key minio
       MINIO_ROOT_PASSWORD: &s3_secret changeme
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
       interval: 30s
       timeout: 20s
       retries: 3