chore: more efficient github actions because of path selection

Author: jeboehm

.github/bin/update_image_tags.py

@@ -107,11 +107,7 @@ def replace_in_kustomization(content: str, new_tag: str) -> Tuple[str, int]:
 
         if in_images_block:
             current_indent = len(line) - len(line.lstrip(" \t"))
-            if (
-                images_indent is not None
-                and current_indent <= images_indent
-                and line.strip()
-            ):
+            if images_indent is not None and current_indent <= images_indent and line.strip():
                 # Left the images block
                 in_images_block = False
                 images_indent = None
@@ -133,9 +129,7 @@ def replace_in_readme(content: str, new_tag: str) -> Tuple[str, int]:
       - ghcr.io/jeboehm/<name>:latest
       - docker.io/jeboehm/<name>:latest
     """
-    pattern = re.compile(
-        r"(?P<name>\b(?:(?:ghcr|docker)\.io/)?jeboehm/[\w\-\.]+):latest\b"
-    )
+    pattern = re.compile(r"(?P<name>\b(?:(?:ghcr|docker)\.io/)?jeboehm/[\w\-\.]+):latest\b")
     new_content, count = pattern.subn(lambda m: f"{m.group('name')}:{new_tag}", content)
     return new_content, count
 
@@ -152,9 +146,7 @@ def main(argv: Sequence[str] | None = None) -> int:
     Returns:
         Exit code (0 for success)
     """
-    parser = argparse.ArgumentParser(
-        description="Update :latest image tags to a specific version"
-    )
+    parser = argparse.ArgumentParser(description="Update :latest image tags to a specific version")
     parser.add_argument("new_tag", help="New tag to set (e.g., v1.2.3)")
     parser.add_argument(
         "--dry-run",
@@ -175,9 +167,7 @@ def main(argv: Sequence[str] | None = None) -> int:
         replacements = 0
         new_content = original
 
-        if path.name in {"docker-compose.yml"} or path.match(
-            "**/deploy/compose/*.yaml"
-        ):
+        if path.name in {"docker-compose.yml"} or path.match("**/deploy/compose/*.yaml"):
             new_content, c = replace_in_compose_yaml(new_content, new_tag)
             replacements += c
 

.github/linters/super-linter-fix.env

@@ -1,5 +1,3 @@
-FIX_BIOME_FORMAT=true
-FIX_BIOME_LINT=true
 FIX_ENV=true
 FIX_JSON=true
 FIX_JSON_PRETTIER=true
@@ -8,5 +6,6 @@ FIX_MARKDOWN_PRETTIER=true
 FIX_PYTHON_BLACK=true
 FIX_PYTHON_ISORT=true
 FIX_PYTHON_RUFF=true
+FIX_PYTHON_RUFF_FORMAT=true
 FIX_SHELL_SHFMT=true
 FIX_YAML_PRETTIER=true

.github/linters/super-linter.env

@@ -1,4 +1,6 @@
 DEFAULT_BRANCH=main
+VALIDATE_BIOME_FORMAT=false
+VALIDATE_BIOME_LINT=false
 VALIDATE_CHECKOV=false
 VALIDATE_GITHUB_ACTIONS=false
 VALIDATE_GITHUB_ACTIONS_ZIZMOR=false
@@ -8,5 +10,6 @@ VALIDATE_KUBERNETES_KUBECONFORM=false
 VALIDATE_PHP=false
 VALIDATE_PHP_PHPCS=false
 VALIDATE_PHP_PSALM=false
+VALIDATE_PYTHON_BLACK=false
 VALIDATE_SQLFLUFF=false
 VALIDATE_TRIVY=false

.github/workflows/dockerhub.yml

@@ -21,6 +21,8 @@ jobs:
           - jeboehm/mailserver-web
           - jeboehm/mailserver-unbound
           - jeboehm/mailserver-ssl
+          - jeboehm/mailserver-db # deprecated
+          - jeboehm/mailserver-virus # deprecated
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
@@ -31,4 +33,4 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: ${{ matrix.repository }}
           enable-url-completion: true
-          short-description: Docker Mailserver based on the famous ISPMail guide
+          short-description: docker-mailserver is inspired by the renowned ISPMail guide.

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: Lint
+on:
+  pull_request:
+concurrency:
+  group: "lint-${{ github.ref }}"
+  cancel-in-progress: true
+jobs:
+  lint:
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        with:
+          fetch-depth: 0
+      - name: Prepare environment
+        run: grep -v '^#' .github/linters/super-linter.env >> "$GITHUB_ENV"
+      - name: Super-Linter
+        uses: super-linter/super-linter@7bba2eeb89d01dc9bfd93c497477a57e72c83240 # v8.2.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -1,7 +1,16 @@
 name: Application test
 on:
   pull_request:
-  merge_group:
+  push:
+    paths:
+      - ".env.dist"
+      - "bin/**"
+      - "deploy/**"
+      - "docker-compose*.yml"
+      - "kustomization.yaml"
+      - "Makefile"
+      - "target/**"
+      - "test/**"
 concurrency:
   group: "test-${{ github.ref }}"
   cancel-in-progress: true

Makefile

@@ -62,7 +62,7 @@ setup:
 
 .PHONY: lint
 lint:
-	docker run --platform linux/amd64 -e RUN_LOCAL=true --rm --env-file .github/linters/super-linter.env --env-file .github/linters/super-linter-fix.env -v $(PWD):/tmp/lint ghcr.io/super-linter/super-linter:v8.1.0
+	docker compose -f test/super-linter/compose.yaml run --rm super-linter
 
 .PHONY: kubernetes-deploy-helper
 kubernetes-deploy-helper:

README.md

@@ -108,6 +108,7 @@ and the documentation [Use another MySQL instance](docs/EXTERNAL_MYSQL.md) for d
   - [TLS](docs/TLS.md)
   - [External MySQL](docs/EXTERNAL_MYSQL.md)
   - [External relay host](docs/RELAYHOST.md)
+  - [Reverse Proxy](docs/REVERSE_PROXY.md)
   - [PHP Sessions](docs/PHP_SESSIONS.md)
 - [Developer Guide](docs/DEVELOPMENT.md)
 

test/super-linter/compose.yaml

@@ -0,0 +1,11 @@
+services:
+  super-linter:
+    platform: linux/amd64
+    image: ghcr.io/super-linter/super-linter:v8.2.0
+    env_file:
+      - ../../.github/linters/super-linter.env
+      - ../../.github/linters/super-linter-fix.env
+    environment:
+      - RUN_LOCAL=true
+    volumes:
+      - ../../:/tmp/lint