Trunk linter (#17)

* linting is fun * mis-detection of missing healthcheck staements. * typo * disable tagging vanity tags on non-main branch * Unbugger node build? * Add gitleaks detector, remove an expired secret. * More linting-derived cleanup * Fiddle with trivy * Fiddle with trivy * add a readme * Fix build bug with php flavours * Marshall should build other flavours of ubuntu. * Fiddle with act cache location. * Add concurrency checks * Composer version gubbins for 7.0/7.1 * ubuntu is just a label, and injected over the top of. * Composer version gubbins for 7.0/7.1 * Run when workflow is altered too please. * Hopefully fix composer stage. * setup tooling meta-tooling. * Add trunk * Disable mirror mode, its being problematic, and increase retries to 5. * Revisit how ghcr login works. * Add trunk checks. * All hail the linter * Heavilly revise workflow * Fettling * Fettling * Fettling * Fettling * Fettling * Cleanup * Cleanup * Fettling.. Why does mitm build but not redis? * Fettling.. Why does mitm build but not redis? * Debuggin * Fettling. * Fix build? * Permissions are a pain * Switch around some should_push logic because envs aren't available that early. * Permissionssssss * Trivy, bane of my life * Fix merge? * Fix labels * Help node along, among other things * Redis 6.1 & 7.1 aren't a thing any more. * Ffff USER nonsense * latest-openssl doesn't exist. * fixup mysqlproxy. * Fix labels * uurrgh * uurrgh * Didn't need to add the mitmproxy user, it exists * Missing ghcr login * Missing backtick * Fix build? * Add validate build step to bouncer. * Fix bouncer build * Disable laravel build * Missing env * Fix swarm mon build * Scout just doesn't seem to work.
2024-02-07 16:21:14 +01:00 · 2024-02-07 16:21:14 +01:00 · 6db6395f66
commit 6db6395f66
parent 73c3900f75
126 changed files with 2925 additions and 2442 deletions
--- a/.actrc
+++ b/.actrc
@ -1,9 +1,11 @@
--secret-file .act-secrets
+--bind
 --action-cache-path .github/cache/act/actions
 --artifact-server-path .github/cache/act/artifacts
+--artifact-server-port 34566
 --cache-server-path .github/cache/act/cache
-P self-hosted=ghcr.io/catthehacker/ubuntu:act-latest
-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest
-P ubuntu-22.04=ghcr.io/catthehacker/ubuntu:act-22.04
-P ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04
-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04
+--use-new-action-cache
+--platform self-hosted=ghcr.io/catthehacker/ubuntu:act-latest
+--platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest
+--platform ubuntu-22.04=ghcr.io/catthehacker/ubuntu:act-22.04
+--platform ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04
+--platform ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04
--- a/.github/cache/act/artifacts/.gitkeep
+++ b/.github/cache/act/artifacts/.gitkeep
--- a/.github/cache/act/cache/.gitkeep
+++ b/.github/cache/act/cache/.gitkeep
--- a/.github/cache/docker/.gitkeep
+++ b/.github/cache/docker/.gitkeep
--- a/.github/workflows/bouncer.yml
+++ b/.github/workflows/bouncer.yml
@ -1,24 +1,25 @@
 name: Build Nginx + LetsEncrypt Bouncer

+permissions:
+  contents: read
+  packages: write
+
 on:
  push:
-    paths:
-      - '.github/workflows/bouncer.yml'
-      - 'bouncer/**'
-  pull_request:
    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Build PHP Flavours
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+      - main
+    paths:
+      - bouncer/**
+      - .github/workflows/bouncer.yml
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  bouncer-build:
-    name: "Bake Bouncer Container"
+    name: Bake Bouncer Container
    runs-on: ubuntu-latest
    steps:
      - name: "Setup: Get Date"
@ -48,17 +49,16 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: "Setup: Login to Docker Hub"
-        if: ${{ !env.ACT }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

      - name: "Setup: Checkout Source"
@ -86,6 +86,7 @@ jobs:
          target: bouncer
          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
+          #push: ${{ env.should_push && !env.ACT }}
          push: true
          build-args: |
            GIT_SHA=${{ github.sha }}
@ -94,5 +95,16 @@ jobs:
          tags: |
            ${{ !env.ACT && 'benzine/bouncer:latest' || '' }}
            ${{ !env.ACT && 'ghcr.io/benzine-framework/bouncer:latest' || 'ghcr.io/benzine-framework/bouncer:devel' }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
+          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=/tmp' }}
+          build-contexts: |
+            php:cli=docker-image://ghcr.io/benzine-framework/php:cli-8.2
+
+      - name: "Validate build"
+        shell: bash
+        run: |
+          docker \
+            run \
+              --rm \
+              ghcr.io/benzine-framework/bouncer:latest \
+                /usr/bin/install-report
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,121 @@
+name: Build
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: build-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+  qc-before:
+    name: QC Trunk
+    uses: ./.github/workflows/trunk.check.yml
+    secrets: inherit
+    permissions: write-all
+
+  marshall:
+    needs: qc-before
+    name: Marshall
+    uses: ./.github/workflows/marshall.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  php:
+    needs: marshall
+    name: PHP Core
+    uses: ./.github/workflows/php.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  #laravel:
+  #  needs: php
+  #  name: PHP Vanity Tags
+  #  uses: ./.github/workflows/laravel.yml
+  #  secrets: inherit
+  #  permissions:
+  #    contents: read
+  #    packages: write
+
+  bouncer:
+    needs: php
+    name: Nginx Load Balancer (Bouncer)
+    uses: ./.github/workflows/bouncer.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  mitm-proxy:
+    needs: qc-before
+    name: Man-in-the-middle proxy w/Healthchecks
+    uses: ./.github/workflows/mitm-proxy.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  mqtt:
+    needs: qc-before
+    name: MQTT w/Healthchecks
+    uses: ./.github/workflows/mqtt.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  mysql-proxy:
+    needs: qc-before
+    name: MySQL Proxy
+    uses: ./.github/workflows/mysql-proxy.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  #node:
+  #  needs: marshall
+  #  name: Node
+  #  uses: ./.github/workflows/node.yml
+  #  secrets: inherit
+  #  permissions:
+  #    contents: read
+  #    packages: write
+
+  redis:
+    needs: qc-before
+    name: Redis w/Healthchecks
+    uses: ./.github/workflows/redis.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  swarm-monitor:
+    needs: php
+    name: Swarm Monitor
+    uses: ./.github/workflows/swarm-monitor.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+
+  wordpress:
+    needs: php
+    name: Wordpress
+    uses: ./.github/workflows/wordpress.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@ -1,23 +1,18 @@
 name: Build Laravel Container

+permissions:
+  contents: read
+  packages: write
 on:
-  push:
-    paths:
-      - 'laravel/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Build PHP Vanity Tags
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  laravel-build:
-    name: "Bake Laravel Container"
+    name: "Build: Laravel Container"
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
@ -36,7 +31,7 @@ jobs:

      - uses: docker/setup-buildx-action@v2

-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
        name: Login to Docker Hub
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
@ -48,27 +43,32 @@ jobs:
          context: laravel
          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
-          push: ${{ !env.ACT && true || false }}
+          push: ${{ env.should_push && !env.ACT }}
          build-args: |
            PHP_VERSION=${{ matrix.version }}
          tags: |
+            ghcr.io/benzine-framework/laravel:php-${{ matrix.version }}
+            benzine/laravel:php-${{ matrix.version }}
            matthewbaggett/laravel:${{ matrix.version }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
+          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=/tmp' }}
+          build-contexts: |
+            php:nginx=docker-image://ghcr.io/benzine-framework/php:nginx-8.2

  laravel-tag-latest:
-    name: "Bake Laravel Container"
+    name: "Tag: Laravel Container"
    runs-on: ubuntu-latest
-    needs: [ laravel-build ]
+    needs: [laravel-build]
    steps:
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
        name: Login to Docker Hub
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: "Retag matthewbaggett/laravel:${{ matrix.version }} to matthewbaggett/laravel:latest"
+
+      - name: "Retag matthewbaggett/laravel:8.3 to matthewbaggett/laravel:latest"
        if: ${{ !env.ACT }}
-        run: | 
-          docker pull matthewbaggett/laravel:8.2
-          docker tag matthewbaggett/laravel:8.2 matthewbaggett/laravel:latest
+        run: |
+          docker pull matthewbaggett/laravel:8.3
+          docker tag matthewbaggett/laravel:8.3 matthewbaggett/laravel:latest
          docker push matthewbaggett/laravel:latest
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -1,31 +0,0 @@
-name: Lint Docker Files
-
-on:
-  schedule:
-    - cron: '0 4 * * TUE'
-  workflow_dispatch:
-  push:
-
-jobs:
-  lint:
-    name: Lint Docker Files
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        dockerfile:
-          - marshall/Dockerfile
-          - php/Dockerfile.Core
-          - php/Dockerfile.Flavours
-          - laravel/Dockerfile
-          - wordpress/Dockerfile
-          - mqtt/Dockerfile
-          - node/Dockerfile
-          - redis/Dockerfile
-          - bouncer/Dockerfile
-          - mitm-proxy/Dockerfile
-    steps:
-      - uses: actions/checkout@v3
-      - uses: hadolint/hadolint-action@v3.1.0 # Yes you have to be version-specific, because they don't publish v3
-        with:
-          dockerfile: ./${{ matrix.dockerfile }}
--- a/.github/workflows/marshall.yml
+++ b/.github/workflows/marshall.yml
@ -1,25 +1,37 @@
 name: Build Marshall

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'marshall/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Lint Docker Files
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

-jobs:
+env:
+  latest-stable-version: "focal"
+  ghcr_image: "ghcr.io/benzine-framework/marshall"
+  docker_hub_image: "benzine/marshall"

+jobs:
  marshall-build:
-    name: "Build Marshall"
+    name: "Build"
    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu:
+          - focal
+          - jammy
+          - lunar
+          - mantic
+          - noble
+          - devel
+          - rolling
+          - latest
+        platform:
+          - linux/amd64
+          - linux/arm64
    steps:
      - name: "Build: Prepare Environment Variables"
        id: environment
@ -34,6 +46,11 @@ jobs:
            echo "marshall_build_host=$(hostname)"
          } >> "$GITHUB_OUTPUT"

+          {
+            platform=${{ matrix.platform }}
+            echo "platform_pair=${platform//\//-}"
+          } >> "$GITHUB_ENV"
+
      - uses: actions/checkout@v4
        with:
          sparse-checkout: |
@ -41,34 +58,177 @@ jobs:

      - uses: docker/setup-qemu-action@v2

-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3

      - name: "Setup: Login to Docker Hub"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

-      - uses: docker/build-push-action@v5
-        name: Build & Push
+      - name: "Setup: Docker meta"
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.ghcr_image }}
+            ${{ env.docker_hub_image }}
+          labels: |
+            org.opencontainers.image.title=Marshall
+            org.opencontainers.image.description=Multi-thread (marshalling..) docker base image built atop Ubuntu ${{ matrix.ubuntu }} & Runit
+            org.opencontainers.image.vendor=Matthew Baggett
+          flavor: |
+            latest=auto
+          tags: |
+            ${{ matrix.ubuntu }}
+
+      - name: "Build: Build Marshall for ${{ matrix.ubuntu }} on ${{ matrix.platform }}"
+        uses: docker/build-push-action@v5
+        id: build
        with:
          context: marshall
-          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
-          pull: true
-          push: ${{ !env.ACT && true || false }}
-          tags: |
-            ghcr.io/benzine-framework/marshall:latest
-            benzine/marshall:latest
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
          build-args: |
            MARSHALL_VERSION=${{ steps.environment.outputs.marshall_version }}
            MARSHALL_BUILD_DATE=${{ steps.environment.outputs.marshall_build_date }}
            MARSHALL_BUILD_HOST=${{ steps.environment.outputs.marshall_build_host }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
+          cache-from: ${{ !env.ACT && 'type=gha,scope=marshall-${{ matrix.ubuntu }}' || '' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max,scope=marshall-${{ matrix.ubuntu }}' || '' }}
+          build-contexts: ubuntu:version=docker-image://ubuntu:${{ matrix.ubuntu }}
+          outputs: |
+            type=image,name=${{ env.ghcr_image }},push-by-digest=true,name-canonical=true,push=true
+
+      - name: "Build: Export digest"
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: "Build: Upload digest"
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.ubuntu }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  marshall-merge:
+    runs-on: ubuntu-latest
+    name: "Merge"
+    needs: [marshall-build]
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu:
+          - focal
+          - jammy
+          - lunar
+          - mantic
+          - noble
+          - devel
+          - rolling
+          - latest
+    steps:
+      - uses: docker/setup-buildx-action@v3
+
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: matthewbaggett
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
+      - name: "Merge: Docker meta"
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.ghcr_image }}
+            ${{ env.docker_hub_image }}
+          labels: |
+            org.opencontainers.image.title=Marshall
+            org.opencontainers.image.description=Multi-thread (marshalling..) docker base image built atop Ubuntu ${{ matrix.ubuntu }} & Runit
+            org.opencontainers.image.vendor=Matthew Baggett
+          flavor: |
+            latest=auto
+          tags: |
+            ${{ matrix.ubuntu }}
+
+      - uses: hmarr/debug-action@v3
+
+      - name: "Setup: Download ${{ matrix.ubuntu }} digests"
+        uses: actions/download-artifact@v3
+        with:
+          path: /tmp/digests
+          name: digests-${{ matrix.ubuntu }}
+
+      - name: "Merge: Create ${{ matrix.ubuntu }} manifest list and push"
+        working-directory: /tmp/digests
+        shell: bash
+        run: |
+          set -o xtrace
+          pwd
+          ls -lah
+
+          docker buildx imagetools \
+            create \
+              $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+              $(printf '${{ env.ghcr_image }}@sha256:%s ' *)
+
+      - name: "Merge: Inspect image"
+        run: |
+          docker buildx imagetools inspect ${{ env.ghcr_image }}:${{ steps.meta.outputs.version }}
+
+  marshall-tag-latest:
+    name: "Tag Latest"
+    runs-on: ubuntu-latest
+    needs: [marshall-merge]
+    strategy:
+      fail-fast: false
+      matrix:
+        output_tag:
+          - "benzine/marshall"
+          - "gone/marshall"
+          - "ghcr.io/benzine-framework/marshall"
+    steps:
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: matthewbaggett
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
+      - name: "Retag ${{ env.ghcr_image }}:${{ env.latest-stable-version }} to ${{ matrix.output_tag }}:bleeding"
+        shell: bash
+        run: |
+          docker pull ${{ env.ghcr_image }}:${{ env.latest-stable-version }}
+          docker tag ${{ env.ghcr_image }}:${{ env.latest-stable-version }} ${{ matrix.output_tag }}:bleeding
+          docker push ${{ matrix.output_tag }}:bleeding
+
+      - name: "Retag ${{ env.ghcr_image }}:${{ env.latest-stable-version }} to ${{ matrix.output_tag }}:latest"
+        if: ${{ github.ref == 'refs/heads/main' }}
+        shell: bash
+        run: |
+          docker pull ${{ env.ghcr_image }}:${{ env.latest-stable-version }}
+          docker tag ${{ env.ghcr_image }}:${{ env.latest-stable-version }} ${{ matrix.output_tag }}:latest
+          docker push ${{ matrix.output_tag }}:latest
--- a/.github/workflows/mitm-proxy.yml
+++ b/.github/workflows/mitm-proxy.yml
@ -1,20 +1,16 @@
 name: Build mitmproxy

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'mitmproxy/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Lint Docker Files
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  mitmproxy-build:
    name: "MITM proxy with Healthchecks"
@ -55,7 +51,6 @@ jobs:
          - 5.1.0
          - 5.0.1
          - 5.0.0
-
    steps:
      - name: "Setup: Setup QEMU"
        uses: docker/setup-qemu-action@v2
@ -73,17 +68,16 @@ jobs:
            mitm-proxy

      - name: "Setup: Login to Docker Hub"
-        if: ${{ !env.ACT }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

      - name: "Build: Build MITM proxy with healthchecks"
@ -91,18 +85,16 @@ jobs:
        with:
          context: mitm-proxy
          build-contexts: |
-            mitmproxy/mitmproxy=docker-image://mitmproxy/mitmproxy:${{ matrix.mitmproxy }}
+            mitmproxy:version=docker-image://mitmproxy/mitmproxy:${{ matrix.mitmproxy }}
          build-args: |
            MITMPROXY_VERSION=${{ matrix.mitmproxy }}
            GIT_SHA=${{ github.sha }}
            BUILD_DATE=${{ github.event.repository.pushed_at }}
          platforms: ${{ (!env.ACT && !(startsWith('6.',matrix.mitmproxy) || startsWith('5.', matrix.mitmproxy))) && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
-            ${{ !env.ACT && format('benzine/mitmproxy:{0}',matrix.mitmproxy) || '' }}
-            ${{ format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }}
+            ${{ format('benzine/mitmproxy:{0}', matrix.mitmproxy) }}
+            ${{ env.should_push && format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }}
          cache-from: ${{ !env.ACT && 'type=gha' || '' }}
          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
-
-
--- a/.github/workflows/mqtt.yml
+++ b/.github/workflows/mqtt.yml
@ -1,39 +1,65 @@
-name: Build MQTT
+name: Mosquitto
+
+permissions:
+  contents: read
+  packages: write

 on:
-  push:
-    paths:
-      - 'mqtt/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Lint Docker Files
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  mqtt-build:
-    name: "MQTT"
+    name: "Build"
    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - latest
+          - 2
+          - 2.0.18
+          - 2.0.14
+          - 1.6
+        openssl:
+          - ""
+          - "-openssl"
+        exclude:
+          - version: latest
+            openssl: "-openssl"
    steps:
      - uses: actions/checkout@v3
+
      - uses: docker/setup-qemu-action@v2
+
      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
-        name: Login to Docker Hub
+
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - uses: docker/build-push-action@v3
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
+      - uses: docker/build-push-action@v4
        name: Build & Push
        with:
          context: mqtt
          platforms: linux/amd64,linux/arm64
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
-            benzine/mqtt
+            gone/mqtt:${{ matrix.version }}${{ matrix.openssl }}
+            benzine/mqtt:${{ matrix.version }}${{ matrix.openssl }}
+            ghcr.io/benzine-framework/mqtt:${{ matrix.version }}${{ matrix.openssl }}
+          build-contexts: |
+            eclipse-mosquitto:injected-version=docker-image://eclipse-mosquitto:${{ matrix.version }}${{ matrix.openssl }}
--- a/.github/workflows/mysql-proxy.yml
+++ b/.github/workflows/mysql-proxy.yml
@ -1,27 +1,25 @@
 name: Build MySQL Proxy

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - '.github/workflows/mysql-proxy.yml'
-      - 'mysql-proxy/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Build PHP Flavours
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+concurrency:
+  group: mysql-proxy-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  mysql-proxy-build:
-    name: "Build MySQL Proxy"
+    name: "Build"
    runs-on: ubuntu-latest
    steps:
-
      - name: "Setup: Setup QEMU"
        uses: docker/setup-qemu-action@v2

@ -32,17 +30,16 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: "Setup: Login to Docker Hub"
-        if: ${{ !env.ACT }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

      - name: "Setup: Checkout Source"
@ -58,9 +55,11 @@ jobs:
          target: mysql-proxy
          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
            ${{ !env.ACT && 'benzine/mysql-proxy:latest' || '' }}
            ${{ !env.ACT && 'ghcr.io/benzine-framework/mysql-proxy:latest' || 'ghcr.io/benzine-framework/mysql-proxy:devel' }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
+          cache-from: ${{ !env.ACT && 'type=gha' || '' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
+          build-contexts: |
+            marshall:version=docker-image://ghcr.io/benzine-framework/marshall:focal
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@ -1,40 +1,61 @@
 name: Build NodeJS Flavours

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'node/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Build Marshall
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+concurrency:
+  group: nodejs-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  node-flavours-build:
-    name: "Build Node Flavours"
+    name: "Build"
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
        yarn:
-          - "3.0.2"
+          - latest
+          - "1.22.21"
+          - "1.22.20"
+          - "1.22.0"
+          - "1.21.0"
+          - "1.20.0"
        node:
-          - "v16.13.0"
+          - latest
+          - "16.13.0"
+          - "16.20.2"
+          - "17.9.1"
+          - "18.19.0"
+          - "19.9.0"
+          - "20.9.0"
+          - "21.6.1"
    steps:
      - uses: actions/checkout@v3
      - uses: docker/setup-qemu-action@v2
      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
-        name: Login to Docker Hub
+
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
      - uses: docker/build-push-action@v3
        name: Build & Push
        with:
@ -43,11 +64,13 @@ jobs:
          target: nodejs
          platforms: linux/amd64,linux/arm64
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
            gone/node:${{ matrix.node }}-${{ matrix.yarn }}
            benzine/node:${{ matrix.node }}-${{ matrix.yarn }}
+            ghcr.io/benzine-framework/node:${{ matrix.node }}-${{ matrix.yarn }}
          build-args: |
            NODE_VERSION=${{ matrix.node }}
            YARN_VERSION=${{ matrix.yarn }}
-
+          build-contexts: |
+            marshall:build=docker-image://ghcr.io/benzine-framework/marshall:focal
--- a/.github/workflows/octoprint.yml
+++ b/.github/workflows/octoprint.yml
@ -1,14 +1,16 @@
 name: Build Octoprint

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'octoprint/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  octoprint-build:
    name: "Bake Octoprint"
@ -17,7 +19,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: docker/setup-qemu-action@v2
      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
        name: Login to Docker Hub
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
@ -29,8 +31,9 @@ jobs:
          target: octoprint
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: matthewbaggett/octoprint:latest
+
  octoprint-mjpg-build:
    name: "Bake Octoprint for yuvu cameras"
    runs-on: ubuntu-latest
@ -38,7 +41,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: docker/setup-qemu-action@v2
      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
        name: Login to Docker Hub
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
@ -50,5 +53,5 @@ jobs:
          target: octoprint-mjpg-streamer
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          pull: true
-          push: true
-          tags: matthewbaggett/octoprint:mjpg-streamer-yu12
+          push: ${{ env.should_push && !env.ACT }}
+          tags: matthewbaggett/octoprint:mjpg-streamer-yu12
--- a/.github/workflows/php-flavours.yml
+++ b/.github/workflows/php-flavours.yml
@ -1,100 +0,0 @@
-name: Build PHP Flavours
-
-on:
-  push:
-    paths:
-      - 'php/apache/**'
-      - 'php/cli/**'
-      - 'php/nginx/**'
-      - 'php/Dockerfile.Flavours'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_dispatch:
-  workflow_run:
-    workflows:
-      - Build PHP Core
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
-
-jobs:
-  php-flavours-build:
-    name: "Build PHP Flavours"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      max-parallel: 15
-      matrix:
-        variant:
-          - cli
-          - nginx
-          - apache
-        version:
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-          - "8.2"
-          - "8.3"
-    steps:
-      - name: Mangle Envs
-        id: vars
-        run: |
-          VERSION=$(echo "${{ matrix.version }}" | tr -d '.')
-          PACKAGE_LIST=PHP_PACKAGES_$VERSION
-          echo ::set-output name=php_packages::${!PACKAGE_LIST}
-
-      - name: Show mangled envs
-        run: |
-          echo "Packages to be installed:"
-          echo ${{ steps.vars.outputs.php_packages }}
-
-      - uses: actions/github-script@v3
-        name: Build Args
-        id: build_args
-        with:
-          result-encoding: string
-          script: return `PHP_VERSION=${{ matrix.version }}\nPHP_CORE_VERSION=benzine/php:core-${{ matrix.version }}`
-
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: php
-
-      - uses: docker/setup-qemu-action@v2
-
-      - uses: docker/setup-buildx-action@v2
-
-      - name: "Setup: Login to Docker Hub"
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_PASSWORD }}
-
-      - uses: docker/build-push-action@v5
-        name: "Build: Build & Push"
-        with:
-          context: php
-          file: php/Dockerfile.Flavours
-          target: php-${{ matrix.variant }}
-          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
-          pull: true
-          push: ${{ !env.ACT && true || false }}
-          tags: |
-            ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
-            gone/php:${{ matrix.variant }}-${{ matrix.version }}
-            benzine/php:${{ matrix.variant }}-${{ matrix.version }}
-          build-args: |
-            ${{ steps.build_args.outputs.result }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
--- a/.github/workflows/php-vanity-tags.yml
+++ b/.github/workflows/php-vanity-tags.yml
@ -1,49 +0,0 @@
-name: Build PHP Vanity Tags
-
-on:
-  workflow_dispatch:
-  workflow_run:
-    workflows:
-      - Build PHP Flavours
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
-
-jobs:
-  php-vanity-tags:
-    name: Vanity Tags
-    runs-on: ubuntu-latest
-    env:
-      latest-stable-version: "8.3"
-      base_tag: "benzine/php"
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - cli
-          - nginx
-          - apache
-        output_tag:
-          - "benzine/php"
-          - "gone/php"
-          - "ghcr.io/benzine-framework/php"
-    steps:
-      - name: "Setup: Login to Docker Hub"
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_PASSWORD }}
-
-      - name: "Retag ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }} to ${{ matrix.output_tag }}:${{ matrix.variant }}"
-        run: |
-          docker pull ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }}
-          docker tag ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }} ${{ matrix.output_tag }}:${{ matrix.variant }}
-          docker push ${{ matrix.output_tag }}:${{ matrix.variant }}
-          
--- a/.github/workflows/php-core.yml
+++ b/.github/workflows/php-core.yml
@ -1,30 +1,28 @@
 name: Build PHP Core

 on:
-  push:
-    paths:
-      - 'php/core/**'
-      - 'php/Dockerfile.Core'
-  pull_request:
-    branches:
-      - '!dependabot/**'
+  workflow_call:
  workflow_dispatch:
-  workflow_run:
-    workflows:
-      - Build Marshall
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+
+permissions:
+  contents: read
+  packages: write
+
+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}

 jobs:
-
-  php-core-build:
-    name: "Build PHP Core"
+  php-flavours-build:
+    name: "Build PHP Flavours"
    runs-on: ubuntu-latest
    strategy:
-      max-parallel: 15
      fail-fast: false
+      max-parallel: 15
      matrix:
+        variant:
+          - cli
+          - nginx
+          - apache
        version:
          - "7.0"
          - "7.1"
@ -45,17 +43,19 @@ jobs:
      PHP_PACKAGES_81: git htop mariadb-client php8.1-apcu php8.1-bcmath php8.1-bz2 php8.1-cli php8.1-curl php8.1-gd php8.1-imap php8.1-imagick php8.1-intl             php8.1-ldap php8.1-mailparse php8.1-mbstring               php8.1-memcache                  php8.1-mongodb php8.1-mysql php8.1-opcache php8.1-pgsql php8.1-phpdbg php8.1-pspell php8.1-redis php8.1-soap php8.1-sqlite php8.1-xdebug php8.1-xml php8.1-zip postgresql-client
      PHP_PACKAGES_82: git htop mariadb-client php8.2-apcu php8.2-bcmath php8.2-bz2 php8.2-cli php8.2-curl php8.2-gd php8.2-imap php8.2-imagick php8.2-intl             php8.2-ldap php8.2-mailparse php8.2-mbstring               php8.2-memcache                  php8.2-mongodb php8.2-mysql php8.2-opcache php8.2-pgsql php8.2-phpdbg php8.2-pspell php8.2-redis php8.2-soap php8.2-sqlite php8.2-xdebug php8.2-xml php8.2-zip postgresql-client
      PHP_PACKAGES_83: git htop mariadb-client php8.3-apcu php8.3-bcmath php8.3-bz2 php8.3-cli php8.3-curl php8.3-gd php8.3-imap php8.3-imagick php8.3-intl             php8.3-ldap php8.3-mailparse php8.3-mbstring               php8.3-memcache                  php8.3-mongodb php8.3-mysql php8.3-opcache php8.3-pgsql php8.3-phpdbg php8.3-pspell php8.3-redis php8.3-soap php8.3-sqlite php8.3-xdebug php8.3-xml php8.3-zip postgresql-client
-      COMPOSER_UPDATE_FLAGS_70: --2.2
-      COMPOSER_UPDATE_FLAGS_71: --2.2
+      COMPOSER_VERSION_70: 2.2.22
+      COMPOSER_VERSION_71: 2.2.22
    steps:
-      - name: Mangle Envs
+      - name: Interpolate Envs
        id: vars
        run: |
-          VERSION=$(echo "${{ matrix.version }}" | tr -d '.')
-          PACKAGE_LIST=PHP_PACKAGES_$VERSION
-          echo ::set-output name=php_packages::${!PACKAGE_LIST}
-          COMPOSER_UPDATE_FLAGS=COMPOSER_UPDATE_FLAGS_$VERSION
-          echo ::set-output name=composer_update_flags::${!COMPOSER_UPDATE_FLAGS}
+          {
+            VERSION=$(echo "${{ matrix.version }}" | tr -d '.')
+            PACKAGE_LIST=PHP_PACKAGES_$VERSION
+            echo php_packages=${!PACKAGE_LIST}
+            COMPOSER_VERSION=COMPOSER_VERSION_$VERSION
+            echo composer_version=${!COMPOSER_VERSION:-"latest-stable"}
+          } >> "$GITHUB_OUTPUT"

      - name: Show mangled envs
        run: |
@ -67,43 +67,94 @@ jobs:
        id: build_args
        with:
          result-encoding: string
-          script: return `PHP_PACKAGES=${{ steps.vars.outputs.php_packages }}\nPHP_VERSION=${{ matrix.version }}\nPHP_CORE_VERSION=benzine/php:core-${{ matrix.version }}\nCOMPOSER_UPDATE_FLAGS=${{ steps.vars.outputs.composer_update_flags }}`
-
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: php
+          script: return `PHP_PACKAGES=${{ steps.vars.outputs.php_packages }}\nPHP_VERSION=${{ matrix.version }}\nCOMPOSER_VERSION=${{ steps.vars.outputs.composer_version }}`

      - uses: docker/setup-qemu-action@v2

      - uses: docker/setup-buildx-action@v2

      - name: "Setup: Login to Docker Hub"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

-      - name: "Build: Build & Push"
-        uses: docker/build-push-action@v5
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: php
+
+      - uses: docker/build-push-action@v5
+        name: "Build: Build & Push"
        with:
          context: php
-          file: php/Dockerfile.Core
-          target: php-core
+          target: php-${{ matrix.variant }}
          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
-          push: ${{ !env.ACT && true || false }}
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
-            ghcr.io/benzine-framework/php:core-${{ matrix.version }}
-            gone/php:core-${{ matrix.version }}
-            benzine/php:core-${{ matrix.version }}
+            ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
+            gone/php:${{ matrix.variant }}-${{ matrix.version }}
+            benzine/php:${{ matrix.variant }}-${{ matrix.version }}
          build-args: |
            ${{ steps.build_args.outputs.result }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
+          cache-from: ${{ !env.ACT && 'type=gha' || '' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
+          build-contexts: |
+            marshall:build=docker-image://ghcr.io/benzine-framework/marshall:focal
+
+      - name: "Validate build"
+        shell: bash
+        run: |
+          docker \
+            run \
+              --rm \
+              ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }} \
+                /usr/bin/install-report
+
+  php-vanity-tags:
+    name: Vanity Tags
+    runs-on: ubuntu-latest
+    needs:
+      - php-flavours-build
+    env:
+      latest-stable-version: "8.3"
+      base_tag: "ghcr.io/benzine-framework/php"
+    strategy:
+      fail-fast: false
+      matrix:
+        variant:
+          - cli
+          - nginx
+          - apache
+        output_tag:
+          - "benzine/php"
+          - "gone/php"
+          - "ghcr.io/benzine-framework/php"
+    steps:
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: matthewbaggett
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
+      - name: "Retag ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }} to ${{ matrix.output_tag }}:${{ matrix.variant }}"
+        if: ${{ github.ref == 'refs/heads/main' }}
+        shell: bash
+        run: |
+          docker pull ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }}
+          docker tag ${{ env.base_tag }}:${{ matrix.variant }}-${{ env.latest-stable-version }} ${{ matrix.output_tag }}:${{ matrix.variant }}
+          docker push ${{ matrix.output_tag }}:${{ matrix.variant }}
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@ -1,25 +1,22 @@
 name: Build Redis

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'redis/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Lint Docker Files
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  redis-build:
-    name: "Redis with Healthchecks"
+    name: "Build"
    runs-on: ubuntu-latest
    strategy:
+      fail-fast: false
      max-parallel: 15
      matrix:
        redis:
@ -30,13 +27,11 @@ jobs:
          - 6-alpine
          - 6-buster
          - 6.0
-          - 6.1
          - 6.2
          - 7
          - 7-alpine
          - 7-bookworm
          - 7.0
-          - 7.1
          - 7.2
          - latest
    steps:
@ -56,17 +51,16 @@ jobs:
            redis

      - name: "Setup: Login to Docker Hub"
-        if: ${{ !env.ACT }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.DOCKER_HUB_PASSWORD }}

      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
+          username: matthewbaggett
          password: ${{ secrets.GHCR_PASSWORD }}

      - name: "Build: Build Redis with Healthchecks"
@ -74,14 +68,14 @@ jobs:
        with:
          context: redis
          build-contexts: |
-            redis=docker-image://redis:${{ matrix.redis }}
+            redis:version=docker-image://redis:${{ matrix.redis }}
+          build-args: |
+            HEALTH_INTERVAL=10s
          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
          pull: true
-          push: ${{ !env.ACT && true || false }}
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
-            ${{ !env.ACT && format('benzine/redis:{0}',matrix.redis) || '' }}
            ${{ format('ghcr.io/benzine-framework/redis:{0}', matrix.redis) }}
-          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }}
-          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}
-
-
+            ${{ env.should_push && format('benzine/redis:{0}',matrix.redis) || '' }}
+          cache-from: ${{ !env.ACT && 'type=gha' || '' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
--- a/.github/workflows/swarm-monitor.yml
+++ b/.github/workflows/swarm-monitor.yml
@ -1,24 +1,85 @@
 name: Build Swarm Monitor

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'swarm-monitor/**'
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  swarm-monitor-build:
    name: Build Swarm Monitor
    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        component:
+          - agent
+          - stats
    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v3
-      - uses: docker/login-action@v2
-        name: Login to Docker Hub
+      - name: "Setup: PHP"
+        uses: shivammathur/setup-php@v2
        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: Bake
-        working-directory: swarm-monitor
-        run: docker buildx bake --push
+          php-version: 8.1
+        env:
+          runner: self-hosted

+      - name: "Setup: Setup QEMU"
+        uses: docker/setup-qemu-action@v2
+
+      - name: "Setup: Expose GitHub Runtime"
+        uses: crazy-max/ghaction-github-runtime@v3
+
+      - name: "Setup: Setup Docker Buildx"
+        uses: docker/setup-buildx-action@v2
+
+      - name: "Setup: Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: matthewbaggett
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
+      - name: "Setup: Checkout Source"
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            swarm-monitor
+
+      - name: "Setup: Configure Cache"
+        uses: actions/cache@v4
+        with:
+          path: swarm-monitor
+          key: ${{ runner.os }}-swarm-monitor-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-swarm-monitor-composer-
+
+      - name: "Dependencies: Composer Install"
+        working-directory: swarm-monitor
+        run: composer install --ignore-platform-reqs
+
+      - name: "Build: Build & Push Image"
+        uses: docker/build-push-action@v5
+        with:
+          context: swarm-monitor
+          target: swarm-${{ matrix.component }}
+          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          pull: true
+          push: ${{ env.should_push && !env.ACT }}
+          tags: |
+            matthewbaggett/swarm-agent:${{ matrix.component }}
+          cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }}
+          cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=/tmp' }}
+          build-contexts: |
+            php:cli=docker-image://ghcr.io/benzine-framework/php:cli-8.2
--- a/.github/workflows/trunk.cache.yml
+++ b/.github/workflows/trunk.cache.yml
@ -0,0 +1,24 @@
+name: Trunk Cache
+on:
+  push:
+    branches: [main]
+    paths: [.trunk/trunk.yaml]
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  trunk-cache:
+    name: Trunk Cache
+    runs-on: self-hosted
+    permissions:
+      actions: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Trunk Check
+        uses: trunk-io/trunk-action@v1
+        with:
+          check-mode: populate_cache_only
--- a/.github/workflows/trunk.check.yml
+++ b/.github/workflows/trunk.check.yml
@ -0,0 +1,27 @@
+name: Code Quality Check (Trunk)
+on:
+  workflow_call:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  trunk-check:
+    name: Trunk Check Runner
+    runs-on: self-hosted
+    permissions:
+      checks: write # For trunk to post annotations
+      contents: read # For repo checkout
+    steps:
+      - name: Checkout
+        if: ${{ !env.ACT }}
+        uses: actions/checkout@v4
+
+      - name: Trunk Check
+        if: ${{ !env.ACT }}
+        uses: trunk-io/trunk-action@v1
--- a/.github/workflows/wordpress.yml
+++ b/.github/workflows/wordpress.yml
@ -1,20 +1,16 @@
 name: Build Wordpress Container

+permissions:
+  contents: read
+  packages: write
+
 on:
-  push:
-    paths:
-      - 'wordpress/**'
-  pull_request:
-    branches:
-      - '!dependabot/**'
-  workflow_run:
-    workflows:
-      - Build PHP Vanity Tags
-    branches: [ 'master', 'feature/**' ]
-    types:
-      - completed
+  workflow_call:
  workflow_dispatch:

+env:
+  should_push: ${{ github.ref == 'refs/heads/main' }}
+
 jobs:
  wordpress-build:
    name: "Bake Wordpress Container"
@ -23,7 +19,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: docker/setup-qemu-action@v2
      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
        name: Login to Docker Hub
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
@ -34,6 +30,8 @@ jobs:
          context: wordpress
          platforms: linux/amd64,linux/arm64
          pull: true
-          push: true
+          push: ${{ env.should_push && !env.ACT }}
          tags: |
            matthewbaggett/wordpress
+          build-contexts: |
+            php:nginx=docker-image://ghcr.io/benzine-framework/php:nginx-8.2
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
 .idea
 /.php-cs-fixer.cache
 /.github/cache
-/.act-secrets
+/.secrets
--- a/.gitleaksignore
+++ b/.gitleaksignore
@ -0,0 +1,7 @@
+948b6fc9559ec3be24a1200a246044d343efa86c:bouncer/grey-ooo-test.yml:generic-api-key:15
+a1a6c22a080fe58f80183f3737972155fc9c8220:bouncer/grey-ooo-test.yml:generic-api-key:15
+919a1b9eefe9291ab0d174c12eb80008da5dfe94:aio/docker-compose.yml:generic-api-key:15
+2fd5c6207464dba39701548ab5a6339f334418fe:bouncer/grey-ooo-test.yml:generic-api-key:13
+2fd5c6207464dba39701548ab5a6339f334418fe:bouncer/self-signed-certificates/example.key:private-key:1
+1b657b62e8a9036e608e3867cd0da4857f9478ca:php/self-signed-certificates/example.key:private-key:1
+25fd34861ee2e2475b1c64de47e9aa54dea80a0e:php/self-signed-certificates/example.key:private-key:1
--- a/.trivyignore
+++ b/.trivyignore
@ -0,0 +1,2 @@
+AVD-DS-0001
+AVD-DS-0002
--- a/.trunk/.gitignore
+++ b/.trunk/.gitignore
@ -0,0 +1,9 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml
+tmp
--- a/.trunk/configs/.gitleaksignore
+++ b/.trunk/configs/.gitleaksignore
@ -0,0 +1,7 @@
+948b6fc9559ec3be24a1200a246044d343efa86c:bouncer/grey-ooo-test.yml:generic-api-key:15
+a1a6c22a080fe58f80183f3737972155fc9c8220:bouncer/grey-ooo-test.yml:generic-api-key:15
+919a1b9eefe9291ab0d174c12eb80008da5dfe94:aio/docker-compose.yml:generic-api-key:15
+2fd5c6207464dba39701548ab5a6339f334418fe:bouncer/grey-ooo-test.yml:generic-api-key:13
+2fd5c6207464dba39701548ab5a6339f334418fe:bouncer/self-signed-certificates/example.key:private-key:1
+1b657b62e8a9036e608e3867cd0da4857f9478ca:php/self-signed-certificates/example.key:private-key:1
+25fd34861ee2e2475b1c64de47e9aa54dea80a0e:php/self-signed-certificates/example.key:private-key:1
--- a/.trunk/configs/.hadolint.yaml
+++ b/.trunk/configs/.hadolint.yaml
@ -1,4 +1,5 @@
 ignored:
  - DL3006
  - DL3008
-  - SC2043
+  - SC2043
+  - SC2312
--- a/.trunk/configs/.markdownlint.yaml
+++ b/.trunk/configs/.markdownlint.yaml
@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false
--- a/.github/cache/act/actions/.gitkeep
+++ b/.github/cache/act/actions/.gitkeep
--- a/.trunk/configs/.shellcheckrc
+++ b/.trunk/configs/.shellcheckrc
@ -0,0 +1,7 @@
+enable=all
+source-path=SCRIPTDIR
+disable=SC2154
+
+# If you're having issues with shellcheck following source, disable the errors via:
+# disable=SC1090
+# disable=SC1091
--- a/.trunk/configs/.trivyignore
+++ b/.trunk/configs/.trivyignore
@ -0,0 +1,2 @@
+AVD-DS-0001
+AVD-DS-0002
--- a/.trunk/configs/.yamllint.yaml
+++ b/.trunk/configs/.yamllint.yaml
@ -0,0 +1,8 @@
+---
+extends: relaxed
+rules:
+  empty-values:
+    ignore:
+      - .github/workflows/*.yml
+  document-start: disable
+  line-length: disable
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@ -0,0 +1,96 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.19.0
+  shell_hooks:
+    enforce: true
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.4.2
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - go@1.21.0
+    - node@18.12.1
+    - python@3.10.8
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  disabled:
+    - terrascan
+  enabled:
+    - gitleaks@8.18.1
+    - actionlint@1.6.26
+    - checkov@3.2.2
+    - git-diff-check
+    - hadolint@2.12.0
+    - markdownlint@0.39.0
+    - osv-scanner@1.6.2
+    - prettier@3.2.4
+    - shellcheck@0.9.0
+    - shfmt@3.6.0
+    - trivy@0.48.3
+    - trufflehog@3.66.2
+    - yamllint@1.33.0
+  ignore:
+    - linters: [markdownlint]
+      paths:
+        - "**/LICENCE.md"
+        - "**/LICENSE.md"
+        - "**/CODE_OF_CONDUCT.md"
+actions:
+  enabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+    - trunk-upgrade-available
+tools:
+  enabled:
+    - jq@jq-1.7.1
+    - gh@2.43.1
+    - act@0.2.59
+    - terraform@1.7.2
+  definitions:
+    - name: gh
+      download: gh
+      known_good_version: 2.27.0
+      environment:
+        - name: PATH
+          list: ["${tool}/bin"]
+      shims: [gh]
+downloads:
+  - name: gh
+    downloads:
+      - os:
+          linux: linux
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/cli/cli/releases/download/v${version}/gh_${version}_${os}_${cpu}.tar.gz
+        strip_components: 1
+      - os:
+          windows: windows
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/cli/cli/releases/download/v${version}/gh_${version}_${os}_${cpu}.zip
+        strip_components: 1
+      # macOS releases since 2.28.0 started using .zip instead of .tar.gz
+      - os:
+          macos: macOS
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/cli/cli/releases/download/v${version}/gh_${version}_${os}_${cpu}.zip
+        strip_components: 1
+        version: ">=2.28.0"
+      - os:
+          macos: macOS
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/cli/cli/releases/download/v${version}/gh_${version}_${os}_${cpu}.tar.gz
+        strip_components: 1
--- a/Readme.md
+++ b/Readme.md
@ -0,0 +1,18 @@
+# Benzine Docker Containers
+
+This repository contains the Dockerfiles for the Benzine containers.
+
+| Container      | Tags                                                                                      | Build status                                                                                                            | Description                                            |
+| -------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
+| PHP 8.3 CLI    | <ul><li>benzine/php:cli-8.3</li><li>ghcr.io/benzine-framework/php:cli-8.3</li></ul>       | [PHP 8.3 CLI Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)    | Multi-thread PHP 8.3 CLI container built atop Runit    |
+| PHP 8.2 CLI    | <ul><li>benzine/php:cli-8.2</li><li>ghcr.io/benzine-framework/php:cli-8.2</li></ul>       | [PHP 8.2 CLI Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)    | Multi-thread PHP 8.2 CLI container built atop Runit    |
+| PHP 8.1 CLI    | <ul><li>benzine/php:cli-8.1</li><li>ghcr.io/benzine-framework/php:cli-8.1</li></ul>       | [PHP 8.1 CLI Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)    | Multi-thread PHP 8.1 CLI container built atop Runit    |
+| PHP 7.4 CLI    | <ul><li>benzine/php:cli-7.4</li><li>ghcr.io/benzine-framework/php:cli-7.4</li></ul>       | [PHP 7.4 CLI Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)    | Multi-thread PHP 7.4 CLI container built atop Runit    |
+| PHP 8.3 NGINX  | <ul><li>benzine/php:nginx-8.3</li><li>ghcr.io/benzine-framework/php:nginx-8.3</li></ul>   | [PHP 8.3 NGINX Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)  | Multi-thread PHP 8.3 NGINX container built atop Runit  |
+| PHP 8.2 NGINX  | <ul><li>benzine/php:nginx-8.2</li><li>ghcr.io/benzine-framework/php:nginx-8.2</li></ul>   | [PHP 8.2 NGINX Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)  | Multi-thread PHP 8.2 NGINX container built atop Runit  |
+| PHP 8.1 NGINX  | <ul><li>benzine/php:nginx-8.1</li><li>ghcr.io/benzine-framework/php:nginx-8.1</li></ul>   | [PHP 8.1 NGINX Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)  | Multi-thread PHP 8.1 NGINX container built atop Runit  |
+| PHP 7.4 NGINX  | <ul><li>benzine/php:nginx-7.4</li><li>ghcr.io/benzine-framework/php:nginx-7.4</li></ul>   | [PHP 7.4 NGINX Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg)  | Multi-thread PHP 7.4 NGINX container built atop Runit  |
+| PHP 8.3 Apache | <ul><li>benzine/php:apache-8.3</li><li>ghcr.io/benzine-framework/php:apache-8.3</li></ul> | [PHP 8.3 Apache Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg) | Multi-thread PHP 8.3 Apache container built atop Runit |
+| PHP 8.2 Apache | <ul><li>benzine/php:apache-8.2</li><li>ghcr.io/benzine-framework/php:apache-8.2</li></ul> | [PHP 8.2 Apache Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg) | Multi-thread PHP 8.2 Apache container built atop Runit |
+| PHP 8.1 Apache | <ul><li>benzine/php:apache-8.1</li><li>ghcr.io/benzine-framework/php:apache-8.1</li></ul> | [PHP 8.1 Apache Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg) | Multi-thread PHP 8.1 Apache container built atop Runit |
+| PHP 7.4 Apache | <ul><li>benzine/php:apache-7.4</li><li>ghcr.io/benzine-framework/php:apache-7.4</li></ul> | [PHP 7.4 Apache Build Status](https://github.com/benzine-framework/docker/actions/workflows/php-flavours.yml/badge.svg) | Multi-thread PHP 7.4 Apache container built atop Runit |
--- a/bouncer/Dockerfile
+++ b/bouncer/Dockerfile
@ -1,10 +1,13 @@
-FROM benzine/php:cli-8.1 as bouncer
+FROM php:cli as bouncer
 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"

+USER root
+# ts:skip=AC_DOCKER_0002 Mis-detecting usage of apt instead of apt-get
 # Install nginx, certbot
-RUN apt-get -qq update && \
+RUN adduser bouncer && \
+    apt-get -qq update && \
    # Install pre-dependencies to use apt-key.
    apt-get -yqq install --no-install-recommends \
        lsb-core \
@ -38,6 +41,7 @@ COPY self-signed-certificates /certs
 # Install runits for services
 COPY nginx.runit /etc/service/nginx/run
 COPY logs.runit /etc/service/nginx-logs/run
+COPY logs.finish /etc/service/nginx-logs/finish
 COPY bouncer.runit /etc/service/bouncer/run
 COPY bouncer.finish /etc/service/bouncer/finish
 COPY logs-nginx-access.runit /etc/service/logs-nginx-access/run
@ -70,6 +74,20 @@ RUN chmod +x /app/bin/bouncer
 VOLUME /etc/letsencrypt
 VOLUME /var/log/bouncer

+# Expose ports
+EXPOSE 80
+EXPOSE 443
+
+# Down-privelege to bouncer
+USER bouncer
+
+# Install Composer dependencies even though we don't need to, it should be done in the build process
+RUN composer install
+
+# Set a healthcheck to curl the bouncer and expect a 200
+HEALTHCHECK --start-period=30s \
+    CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1
+
 # stuff some envs from build
 ARG BUILD_DATE
 ARG GIT_SHA
@ -80,10 +98,16 @@ ENV BUILD_DATE=${BUILD_DATE} \

 FROM benzine/php:nginx-8.1 as test-app-a
 COPY ./test/public-web-a /app/public
+HEALTHCHECK --start-period=30s \
+    CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1

 FROM benzine/php:nginx-8.1 as test-app-b
 COPY ./test/public-web-b /app/public
+HEALTHCHECK --start-period=30s \
+    CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1

 FROM benzine/php:nginx-8.1 as test-app-c
 COPY ./test/public-web-c /app/public
+HEALTHCHECK --start-period=30s \
+    CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1

--- a/bouncer/Readme.md
+++ b/bouncer/Readme.md
@ -1,13 +1,16 @@
 # Automatic Swarm Nginx Load Balancer

 ## Environment variables
+
 This container has its own environment variables, AS WELL AS scanning for some environment variables associated with your services.
 These should not be confused.

 ### Load Balancer Configuration
+
 #### Main configuration
+
 | Key                                           | Default                                         | Options                                     | Behaviour                                                                                                                                                                                                                            |
-|-----------------------------------------------|-------------------------------------------------|---------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| --------------------------------------------- | ----------------------------------------------- | ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --- |
 | DOCKER_HOST                                   | false                                           |                                             | Define a http endpoint representing your docker socket. If this is null, it connects to /var/lib/docker.sock                                                                                                                         |
 | GLOBAL_CERT                                   | false                                           | Contents of an ssl certificate              | If you want to provide a single cert for all endpoints, perhaps with a catch-all that may be later overriden, you can provide the whole contents of a certificates file here.                                                        |
 | GLOBAL_CERT_KEY                               | false                                           | Contents of an ssl certificates private key | The private key related to GLOBAL CERT. These must be provided in tandem.                                                                                                                                                            |
@ -18,30 +21,33 @@ These should not be confused.
 | LOG_LEVEL                                     | debug                                           | info, debug, critical etc                   | The level of logging to write to the log file. See Monolog docs.                                                                                                                                                                     |
 | LOG_LEVEL_NAME_LENGTH                         | 4                                               | positive numbers                            | The length of the level name to be written to the log file. See Monolog docs.                                                                                                                                                        |
 | LOG_LINE_FORMAT                               | [%datetime%] %level_name%: %channel%: %message% |                                             | The format of the log line. See Monolog docs.                                                                                                                                                                                        |
-| LOG_COLOUR                                    | true                                            | true, false                                 | Whether to colourise the log output sent to stdout.                                                                                                                                                                                  |                                                                                                                                                                             |
+| LOG_COLOUR                                    | true                                            | true, false                                 | Whether to colourise the log output sent to stdout.                                                                                                                                                                                  |     |

 #### For using with Lets Encrypt:tm:
+
 | Key                       | Default   | Options                   | Behaviour                                                                            |
-|---------------------------|-----------|---------------------------|--------------------------------------------------------------------------------------|
-| BOUNCER_LETSENCRYPT_MODE  | 'staging' | 'staging' or 'production' | Determine if this is going to connect to a production or staging Lets Encrypt server | 
+| ------------------------- | --------- | ------------------------- | ------------------------------------------------------------------------------------ |
+| BOUNCER_LETSENCRYPT_MODE  | 'staging' | 'staging' or 'production' | Determine if this is going to connect to a production or staging Lets Encrypt server |
 | BOUNCER_LETSENCRYPT_EMAIL |           | 'bob@example.com'         | Email address to associate with lets encrypt                                         |

 #### For using S3-compatable storage for generated cert synchronisation with Lets Encrypt
+
 | Key                                | Default | Options         | Behaviour                                                                             |
-|------------------------------------|---------|-----------------|---------------------------------------------------------------------------------------|
+| ---------------------------------- | ------- | --------------- | ------------------------------------------------------------------------------------- | --- |
 | BOUNCER_S3_BUCKET                  | false   |                 | enable S3 behaviour to store lets-encrypt generated certs                             |
 | BOUNCER_S3_ENDPOINT                | false   |                 | define s3 endpoint to override default AWS s3 implementation, for example, with minio |
-| BOUNCER_S3_KEY_ID                  | false   |                 | S3 API Key ID                                                                         |                                                                                                              |
-| BOUNCER_s3_KEY_SECRET              | false   |                 | S3 API Key Secret                                                                     |                                                                                            
+| BOUNCER_S3_KEY_ID                  | false   |                 | S3 API Key ID                                                                         |     |
+| BOUNCER_s3_KEY_SECRET              | false   |                 | S3 API Key Secret                                                                     |
 | BOUNCER_S3_REGION                  | false   |                 | S3 API Region                                                                         |
 | BOUNCER_S3_USE_PATH_STYLE_ENDPOINT | false   | `true or false` | Needed for minio                                                                      |
 | BOUNCER_S3_PREFIX                  | false   |                 | Prefix file path in s3 bucket                                                         |

 ### Served Instance Configuration
+
 These environment variables need to be applied to the CONSUMING SERVICE and not the loadbalancer container itself.

 | Key                            | Example                                                                 | Behaviour                                                                                                                                                                                                   |
-|--------------------------------|-------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ------------------------------ | ----------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | BOUNCER_DOMAIN                 | "a.example.com"                                                         | The domain that should be directed to this container                                                                                                                                                        |
 | BOUNCER_LABEL                  | "MyService"                                                             | The label that should be directed to this container                                                                                                                                                         |
 | BOUNCER_AUTH                   | "username:password" e.g "root:toor"                                     | Add a HTTP BASIC auth requirement to this hostname.                                                                                                                                                         |
@ -51,7 +57,8 @@ These environment variables need to be applied to the CONSUMING SERVICE and not
 | BOUNCER_ALLOW_NON_SSL          | Defaults to enabled. Values are "yes" or "true", anything else is false | Should HTTP only traffic be allowed to hit this service? If disabled, http traffic is forwarded towards https                                                                                               |
 | BOUNCER_ALLOW_WEBSOCKETS       | Defaults to enabled. Values are "yes" or "true", anything else is false | Enable websocket behaviour                                                                                                                                                                                  |
 | BOUNCER_ALLOW_LARGE_PAYLOADS   | Defaults to disabled.                                                   | Allows overriding the default nginx payload size. Related to BOUNCER_MAX_PAYLOADS_MEGABYTES                                                                                                                 |
-| BOUNCER_MAX_PAYLOADS_MEGABYTES | numbers                                                                 | Size of max payload to allow, in megabytes. Requires BOUNCER_ALLOW_LARGE_PAYLOADS to be enabled                                                                                                             | 
+| BOUNCER_MAX_PAYLOADS_MEGABYTES | numbers                                                                 | Size of max payload to allow, in megabytes. Requires BOUNCER_ALLOW_LARGE_PAYLOADS to be enabled                                                                                                             |

 ## Security considerations
+
 If you're putting this behind access control to the docker socket, it will need access to the /swarm /services and /containers endpoints of the docker api.
--- a/bouncer/bouncer.finish
+++ b/bouncer/bouncer.finish
@ -1,2 +1,2 @@
-#!/bin/bash
-sleep 5;
+#!/usr/bin/env bash
+sleep 5
--- a/bouncer/build-compose.yml
+++ b/bouncer/build-compose.yml
@ -4,4 +4,4 @@ services:
    build:
      context: .
      target: bouncer
-    image: ghcr.io/benzine-framework/bouncer:latest
+    image: ghcr.io/benzine-framework/bouncer:latest
--- a/bouncer/composer.json
+++ b/bouncer/composer.json
@ -1,47 +1,47 @@
 {
-    "name": "benzine/bouncer",
-    "description": "Automated Docker-swarm aware Nginx configuration management",
-    "type": "project",
-    "config": {
-        "sort-packages": true
-    },
-    "license": "GPL-3.0-or-later",
-    "require": {
-        "php": "^8.1",
-        "ext-curl": "*",
-        "ext-json": "*",
-        "ext-openssl": "*",
-        "adambrett/shell-wrapper": "~1.0",
-        "bramus/monolog-colored-line-formatter": "~3.1",
-        "guzzlehttp/guzzle": "^7.8",
-        "kint-php/kint": "^3.3",
-        "league/flysystem": "^2.5",
-        "league/flysystem-aws-s3-v3": "^2.5",
-        "monolog/monolog": "^3.5",
-        "nesbot/carbon": "^2.72",
-        "phpspec/php-diff": "^1.1",
-        "spatie/emoji": "^2.3",
-        "symfony/yaml": "^6.4",
-        "twig/twig": "^3.8"
-    },
-    "authors": [
-        {
-            "name": "Matthew Baggett",
-            "email": "matthew@baggett.me"
-        }
-    ],
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.46"
-    },
-    "autoload": {
-        "psr-4": {
-            "Bouncer\\": "src/"
-        }
-    },
-    "scripts": {
-        "fix": "php-cs-fixer fix"
-    },
-    "bin": [
-        "bin/bouncer"
-    ]
+  "name": "benzine/bouncer",
+  "description": "Automated Docker-swarm aware Nginx configuration management",
+  "type": "project",
+  "config": {
+    "sort-packages": true
+  },
+  "license": "GPL-3.0-or-later",
+  "require": {
+    "php": "^8.1",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-openssl": "*",
+    "adambrett/shell-wrapper": "~1.0",
+    "bramus/monolog-colored-line-formatter": "~3.1",
+    "guzzlehttp/guzzle": "^7.8",
+    "kint-php/kint": "^3.3",
+    "league/flysystem": "^2.5",
+    "league/flysystem-aws-s3-v3": "^2.5",
+    "monolog/monolog": "^3.5",
+    "nesbot/carbon": "^2.72",
+    "phpspec/php-diff": "^1.1",
+    "spatie/emoji": "^2.3",
+    "symfony/yaml": "^6.4",
+    "twig/twig": "^3.8"
+  },
+  "authors": [
+    {
+      "name": "Matthew Baggett",
+      "email": "matthew@baggett.me"
+    }
+  ],
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.46"
+  },
+  "autoload": {
+    "psr-4": {
+      "Bouncer\\": "src/"
+    }
+  },
+  "scripts": {
+    "fix": "php-cs-fixer fix"
+  },
+  "bin": [
+    "bin/bouncer"
+  ]
 }
--- a/bouncer/composer.lock
+++ b/bouncer/composer.lock
@ -107,16 +107,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.297.0",
+            "version": "3.298.0",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ad1f7be78d74d48628a6fe345818ce53bae64169"
+                "reference": "55536f81006d8721c51e342d638e7ccc3529e754"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ad1f7be78d74d48628a6fe345818ce53bae64169",
-                "reference": "ad1f7be78d74d48628a6fe345818ce53bae64169",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55536f81006d8721c51e342d638e7ccc3529e754",
+                "reference": "55536f81006d8721c51e342d638e7ccc3529e754",
                "shasum": ""
            },
            "require": {
@ -196,9 +196,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.297.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.298.0"
            },
-            "time": "2024-01-24T19:09:39+00:00"
+            "time": "2024-01-31T19:06:05+00:00"
        },
        {
            "name": "bramus/ansi-php",
@ -921,16 +921,16 @@
        },
        {
            "name": "league/mime-type-detection",
-            "version": "1.14.0",
+            "version": "1.15.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e"
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
                "shasum": ""
            },
            "require": {
@ -961,7 +961,7 @@
            "description": "Mime-type detection for Flysystem",
            "support": {
                "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
            },
            "funding": [
                {
@ -973,7 +973,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-17T14:13:20+00:00"
+            "time": "2024-01-28T23:22:08+00:00"
        },
        {
            "name": "monolog/monolog",
@ -1144,16 +1144,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.72.2",
+            "version": "2.72.3",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130"
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130",
-                "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
                "shasum": ""
            },
            "require": {
@ -1247,7 +1247,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-19T00:21:53+00:00"
+            "time": "2024-01-25T10:35:09+00:00"
        },
        {
            "name": "phpspec/php-diff",
@ -1975,16 +1975,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681"
+                "reference": "637c51191b6b184184bbf98937702bcf554f7d04"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a2ab2ec1a462e53016de8e8d5e8912bfd62ea681",
-                "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/637c51191b6b184184bbf98937702bcf554f7d04",
+                "reference": "637c51191b6b184184bbf98937702bcf554f7d04",
                "shasum": ""
            },
            "require": {
@ -2007,7 +2007,7 @@
                "symfony/translation-implementation": "2.3|3.0"
            },
            "require-dev": {
-                "nikic/php-parser": "^4.13",
+                "nikic/php-parser": "^4.18|^5.0",
                "psr/log": "^1|^2|^3",
                "symfony/config": "^5.4|^6.0|^7.0",
                "symfony/console": "^5.4|^6.0|^7.0",
@ -2050,7 +2050,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.2"
+                "source": "https://github.com/symfony/translation/tree/v6.4.3"
            },
            "funding": [
                {
@ -2066,7 +2066,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-18T09:25:29+00:00"
+            "time": "2024-01-29T13:11:52+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@ -2148,16 +2148,16 @@
        },
        {
            "name": "symfony/yaml",
-            "version": "v6.4.0",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587"
+                "reference": "d75715985f0f94f978e3a8fa42533e10db921b90"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90",
+                "reference": "d75715985f0f94f978e3a8fa42533e10db921b90",
                "shasum": ""
            },
            "require": {
@ -2200,7 +2200,7 @@
            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.0"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.3"
            },
            "funding": [
                {
@ -2216,7 +2216,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-06T11:00:25+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "twig/twig",
@ -2773,16 +2773,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625"
+                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
+                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
                "shasum": ""
            },
            "require": {
@ -2847,7 +2847,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.2"
+                "source": "https://github.com/symfony/console/tree/v6.4.3"
            },
            "funding": [
                {
@ -2863,20 +2863,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T16:15:48+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "e95216850555cd55e71b857eb9d6c2674124603a"
+                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e95216850555cd55e71b857eb9d6c2674124603a",
-                "reference": "e95216850555cd55e71b857eb9d6c2674124603a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
+                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
                "shasum": ""
            },
            "require": {
@ -2927,7 +2927,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.2"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3"
            },
            "funding": [
                {
@ -2943,7 +2943,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-27T22:16:42+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@ -3023,16 +3023,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v6.4.0",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
+                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
                "shasum": ""
            },
            "require": {
@ -3066,7 +3066,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
            },
            "funding": [
                {
@ -3082,7 +3082,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-26T17:27:13+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/finder",
@ -3461,16 +3461,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241"
+                "reference": "31642b0818bfcff85930344ef93193f8c607e0a3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241",
-                "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241",
+                "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3",
+                "reference": "31642b0818bfcff85930344ef93193f8c607e0a3",
                "shasum": ""
            },
            "require": {
@ -3502,7 +3502,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.2"
+                "source": "https://github.com/symfony/process/tree/v6.4.3"
            },
            "funding": [
                {
@ -3518,7 +3518,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-22T16:42:54+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/service-contracts",
@ -3604,16 +3604,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v6.4.0",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
+                "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/416596166641f1f728b0a64f5b9dd07cceb410c1",
+                "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1",
                "shasum": ""
            },
            "require": {
@ -3646,7 +3646,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.4.3"
            },
            "funding": [
                {
@ -3662,20 +3662,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-16T10:14:28+00:00"
+            "time": "2024-01-23T14:35:58+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc"
+                "reference": "7a14736fb179876575464e4658fce0c304e8c15b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b",
+                "reference": "7a14736fb179876575464e4658fce0c304e8c15b",
                "shasum": ""
            },
            "require": {
@ -3732,7 +3732,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.2"
+                "source": "https://github.com/symfony/string/tree/v6.4.3"
            },
            "funding": [
                {
@ -3748,7 +3748,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T16:15:48+00:00"
+            "time": "2024-01-25T09:26:29+00:00"
        }
    ],
    "aliases": [],
@ -3763,5 +3763,5 @@
        "ext-openssl": "*"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
--- a/bouncer/docker-compose.yml
+++ b/bouncer/docker-compose.yml
@ -9,14 +9,14 @@ services:
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
      - ./:/app
-#    environment:
-#      - BOUNCER_LETSENCRYPT_MODE=staging
-#      - BOUNCER_LETSENCRYPT_EMAIL=matthew@baggett.me
-#      - BOUNCER_S3_ENDPOINT=http://grey.ooo:9000
-#      - BOUNCER_S3_KEY_ID=geusebio
-#      - BOUNCER_S3_KEY_SECRET=changeme
-#      - BOUNCER_S3_BUCKET=bouncer-certificates
-#      - BOUNCER_S3_USE_PATH_STYLE_ENDPOINT="yes"
+    #    environment:
+    #      - BOUNCER_LETSENCRYPT_MODE=staging
+    #      - BOUNCER_LETSENCRYPT_EMAIL=matthew@baggett.me
+    #      - BOUNCER_S3_ENDPOINT=http://grey.ooo:9000
+    #      - BOUNCER_S3_KEY_ID=geusebio
+    #      - BOUNCER_S3_KEY_SECRET=changeme
+    #      - BOUNCER_S3_BUCKET=bouncer-certificates
+    #      - BOUNCER_S3_USE_PATH_STYLE_ENDPOINT="yes"
    ports:
      - 127.0.99.100:80:80
      - 127.0.99.100:443:443
@ -30,7 +30,8 @@ services:
      - ./test/public-web-a:/app/public
    environment:
      - BOUNCER_DOMAIN=a.web.grey.ooo
-#      - BOUNCER_LETSENCRYPT=true
+      - BOUNCER_TARGET_PORT=80
+  #      - BOUNCER_LETSENCRYPT=true

  web-b:
    image: test-app-b
@ -41,5 +42,5 @@ services:
      - ./test/public-web-b:/app/public
    environment:
      - BOUNCER_DOMAIN=b.web.grey.ooo
+      - BOUNCER_TARGET_PORT=80
 #      - BOUNCER_LETSENCRYPT=true
-
--- a/bouncer/grey-ooo-test.yml
+++ b/bouncer/grey-ooo-test.yml
@ -1,57 +0,0 @@
-version: "3.4"
-
-services:
-  bouncer:
-    build:
-      context: .
-      target: bouncer
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-#    environment:
-#      - BOUNCER_LETSENCRYPT_MODE=production
-#      - BOUNCER_LETSENCRYPT_EMAIL=matthew@baggett.me
-#      - BOUNCER_S3_ENDPOINT=http://grey.ooo:9000
-#      - BOUNCER_S3_KEY_ID=geusebio
-#      - BOUNCER_S3_KEY_SECRET=teblE0neTf2NQcVFaZIRkSF44RscyQ3G
-#      - BOUNCER_S3_BUCKET=bouncer-certificates
-#      - BOUNCER_S3_USE_PATH_STYLE_ENDPOINT="yes"
-    ports:
-      - 127.0.0.5:80:80
-      - 127.0.0.5:443:443
-    depends_on:
-      - web-a
-      - web-b
-      - web-c
-
-  web-a:
-    build:
-      context: .
-      target: test-app-a
-    environment:
-      - BOUNCER_DOMAIN=a.web.grey.ooo
-      - BOUNCER_LETSENCRYPT=false
-      - BOUNCER_TARGET_PORT=80
-    ports:
-      - 127.0.0.5:81:80
-
-  web-b:
-    build:
-      context: .
-      target: test-app-b
-    environment:
-      - BOUNCER_DOMAIN=b.web.grey.ooo
-      - BOUNCER_LETSENCRYPT=false
-      - BOUNCER_TARGET_PORT=80
-    ports:
-      - 127.0.0.5:82:80
-
-  web-c:
-    build:
-      context: .
-      target: test-app-c
-    environment:
-      - BOUNCER_DOMAIN=c.web.grey.ooo
-      - BOUNCER_LETSENCRYPT=false
-      - BOUNCER_TARGET_PORT=80
-    ports:
-      - 127.0.0.5:83:80
--- a/bouncer/logs-nginx-access.runit
+++ b/bouncer/logs-nginx-access.runit
@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-tail -f /var/log/nginx/access.log | sed --unbuffered 's|.*\[.*\] |[NGINX] |g' | grep -v /v1/ping
+# shellcheck disable=SC2312
+tail -f /var/log/nginx/access.log | sed --unbuffered 's|.*\[.*\] |[NGINX] |g' | grep -v /v1/ping
--- a/bouncer/logs-nginx-error.runit
+++ b/bouncer/logs-nginx-error.runit
@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-tail -f /var/log/nginx/error.log
+tail -f /var/log/nginx/error.log
--- a/bouncer/logs.finish
+++ b/bouncer/logs.finish
@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+sleep infinity
--- a/bouncer/logs.runit
+++ b/bouncer/logs.runit
@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-if [[ -f /var/log/bouncer/*.log ]]; then
-  tail -f /var/log/bouncer/*.log
-else
-    sleep 1
-fi
+#if [[ -f /var/log/bouncer/bouncer.log ]]; then
+#	tail -f /var/log/bouncer/bouncer.log
+#fi
--- a/bouncer/public/index.html
+++ b/bouncer/public/index.html
@ -1,7 +1,9 @@
 <html>
-<head><title>👻 Nothing to see here!</title></head>
-<body>
-<h1>Oops!</h1>
-<p>There's nothing here.</p>
-</body>
+  <head>
+    <title>👻 Nothing to see here!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>There's nothing here.</p>
+  </body>
 </html>
--- a/bouncer/test/public-web-a/index.html
+++ b/bouncer/test/public-web-a/index.html
@ -1 +1 @@
-<h1>Website A</h1>
+<h1>Website A</h1>
--- a/bouncer/test/public-web-b/index.html
+++ b/bouncer/test/public-web-b/index.html
@ -1 +1 @@
-<h1>Website B</h1>
+<h1>Website B</h1>
--- a/bouncer/test/public-web-c/index.html
+++ b/bouncer/test/public-web-c/index.html
@ -1 +1 @@
-<h1>Website C</h1>
+<h1>Website C</h1>
--- a/laravel/CODE_OF_CONDUCT.md
+++ b/laravel/CODE_OF_CONDUCT.md
@ -1,17 +1,20 @@
 This code of conduct outlines our expectations for participants within the open source community. Anyone who violates this code of conduct may be banned from contributing here.

 # Requirements
-* __Be friendly and patient.__
-* __Be welcoming__ _We strive to be a community that welcomes and supports people of all backgrounds and identities._
-* __Be respectful__ _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._
+
+- **Be friendly and patient.**
+- **Be welcoming** _We strive to be a community that welcomes and supports people of all backgrounds and identities._
+- **Be respectful** _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._

 # Unacceptable Behaviour
-* Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
-* Threats of violence, both physical and psycological.
-* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-* Continued communication after requests to cease.
+
+- Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
+- Threats of violence, both physical and psycological.
+- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+- Continued communication after requests to cease.

 # Interactions
-* Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
-* Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
-* We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
+
+- Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
+- Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
+- We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
--- a/laravel/Dockerfile
+++ b/laravel/Dockerfile
@ -1,5 +1,4 @@
-ARG PHP_VERSION
-FROM benzine/php:nginx-${PHP_VERSION}
+FROM php:nginx
 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"
@ -19,4 +18,9 @@ COPY laravel-horizon.finish /etc/service/horizon/finish
 COPY laravel-scheduler.runit /etc/service/scheduler/run
 COPY migrate.runit /etc/service/migrate/run
 COPY wait-for-mysql /usr/bin/wait-for-mysql
-RUN chmod +x /etc/service/*/run /etc/service/*/finish /usr/bin/wait-for-mysql
+RUN chmod +x /etc/service/*/run /etc/service/*/finish /usr/bin/wait-for-mysql
+HEALTHCHECK --interval=10s --timeout=3s \
+    CMD curl -f http://localhost/ || exit 1
+
+RUN adduser laravel
+USER laravel
--- a/laravel/LICENSE.md
+++ b/laravel/LICENSE.md
@ -1,190 +1,190 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for
 software and other kinds of works.

-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users. We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+any other work released this way by its authors. You can apply it to
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.

-  For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
 know their rights.

-  Developers that use the GNU GPL protect your rights with two steps:
+Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.

-  Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
 pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
+use, which is precisely where it is most unacceptable. Therefore, we
 have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
+products. If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.

-  Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
+make it effectively proprietary. To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.

-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.

                       TERMS AND CONDITIONS

-  0. Definitions.
+0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU General Public License.

-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.

-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.

-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.

-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.

-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.

-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.

-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.

-  1. Source Code.
+1. Source Code.

-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.

-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.

-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.

-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.

-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.

-  2. Basic Permissions.
+2. Basic Permissions.

-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.

-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.

-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.

-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.

-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.

-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@ -202,12 +202,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.

-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.

-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.

-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:

@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions:
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.

-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.

-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@ -290,75 +290,75 @@ in one of these ways:
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.

-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.

-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.

-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).

-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.

-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.

-  7. Additional Terms.
+7. Additional Terms.

-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.

-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.

-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:

@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms:
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.

-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.

-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.

-  8. Termination.
+8. Termination.

-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).

-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.

-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.

-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.

-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.

-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.

-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.

-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.

-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@ -460,43 +460,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.

-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.

-  11. Patents.
+11. Patents.

-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".

-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.

-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.

-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@ -504,13 +504,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.

-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@ -518,10 +518,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.

-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@ -533,73 +533,73 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.

-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.

-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.

-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+13. Use with the GNU Affero General Public License.

-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.

-  14. Revised Versions of this License.
+14. Revised Versions of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.

-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-  16. Limitation of Liability.
+16. Limitation of Liability.

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@ -609,9 +609,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.

-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.

-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@ -622,11 +622,11 @@ copy of the Program in return for a fee.

            How to Apply These Terms to Your New Programs

-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.

-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode:
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
+parts of the General Public License. Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".

-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/laravel/laravel-horizon.finish
+++ b/laravel/laravel-horizon.finish
@ -1,2 +1,2 @@
 #!/bin/bash
-sleep 20;
+sleep 20
--- a/laravel/laravel-horizon.runit
+++ b/laravel/laravel-horizon.runit
@ -2,28 +2,27 @@
 rm -f /var/lock/laravel_horizon_started

 # If horizon is present, publish the frontend assets, if HORIZON_UI is set to "on"
-if [ "${HORIZON_ENABLE,,}" = "on" ]; then
-  if [[ -f "/app/config/horizon.php" ]]; then
-    if [ "${MIGRATE_ENABLE}" = "on" ]; then
-      echo "[HORIZON] Waiting until Migration Complete."
-      until [ -f /var/lock/laravel_migration_complete ]
-      do
-           sleep 1
-      done
-      echo "[HORIZON] Migration is complete, running Horizon."
-    fi
-    if [ "${HORIZON_UI,,}" = "on" ]; then
-      echo "[HORIZON] Publishing horizon frontend assets"
-      php /app/artisan horizon:publish
-    fi
-    echo "[HORIZON] Running laravel horizon runner"
-    cpulimit -l 30 -- php /app/artisan horizon
-    touch /var/lock/laravel_horizon_started
-  else
-    echo "[HORIZON] Horizon is not present."
-  fi
+if [[ ${HORIZON_ENABLE,,} == "on" ]]; then
+	if [[ -f "/app/config/horizon.php" ]]; then
+		if [[ ${MIGRATE_ENABLE} == "on" ]]; then
+			echo "[HORIZON] Waiting until Migration Complete."
+			until [[ -f /var/lock/laravel_migration_complete ]]; do
+				sleep 1
+			done
+			echo "[HORIZON] Migration is complete, running Horizon."
+		fi
+		if [[ ${HORIZON_UI,,} == "on" ]]; then
+			echo "[HORIZON] Publishing horizon frontend assets"
+			php /app/artisan horizon:publish
+		fi
+		echo "[HORIZON] Running laravel horizon runner"
+		cpulimit -l 30 -- php /app/artisan horizon
+		touch /var/lock/laravel_horizon_started
+	else
+		echo "[HORIZON] Horizon is not present."
+	fi
 else
-  echo "[HORIZON] Not enabled. To enable this feature, set HORIZON_ENABLE = on."
+	echo "[HORIZON] Not enabled. To enable this feature, set HORIZON_ENABLE = on."
 fi

 sleep infinity
--- a/laravel/laravel-scheduler.runit
+++ b/laravel/laravel-scheduler.runit
@ -1,19 +1,18 @@
 #!/bin/bash
-cd /app
-if [ "${SCHEDULER_ENABLE,,}" = "on" ]; then
-  if [ "${MIGRATE_ENABLE}" = "on" ]; then
-    echo "[SCHEDULER] Waiting until Migration Complete."
-    until [ -f /var/lock/laravel_migration_complete ]
-    do
-       sleep 1
-    done
-    echo "[SCHEDULER] Migrations complete, starting scheduler"
-  fi
-  while true; do
-    php /app/artisan schedule:run
-    sleep 59;
-  done
+cd /app || exit
+if [[ ${SCHEDULER_ENABLE,,} == "on" ]]; then
+	if [[ ${MIGRATE_ENABLE} == "on" ]]; then
+		echo "[SCHEDULER] Waiting until Migration Complete."
+		until [[ -f /var/lock/laravel_migration_complete ]]; do
+			sleep 1
+		done
+		echo "[SCHEDULER] Migrations complete, starting scheduler"
+	fi
+	while true; do
+		php /app/artisan schedule:run
+		sleep 59
+	done
 else
-  echo "[SCHEDULER] Not enabled. To enable this feature, set SCHEDULER_ENABLE = on."
-  sleep infinity
-fi
+	echo "[SCHEDULER] Not enabled. To enable this feature, set SCHEDULER_ENABLE = on."
+	sleep infinity
+fi
--- a/laravel/laravel.runit
+++ b/laravel/laravel.runit
@ -12,9 +12,9 @@ chmod 777 -R /app/storage
 chmod +x /app/artisan

 php /app/artisan package:discover
-if [ "${REGENERATE_KEYS,,}" = "on" ]; then
-  php /app/artisan key:generate
-  php /app/artisan passport:keys --force
+if [[ ${REGENERATE_KEYS,,} == "on" ]]; then
+	php /app/artisan key:generate
+	php /app/artisan passport:keys --force
 fi

 echo "[LARAVEL-FIXER] Waiting for mysql..."
@ -30,5 +30,5 @@ tail -n0 -f /app/storage/logs/laravel-*.log /app/storage/logs/laravel.log &

 # Sleep forever (and sleep again incase the sleep process is killed)
 while true; do
-  sleep infinity
+	sleep infinity
 done
--- a/laravel/migrate.runit
+++ b/laravel/migrate.runit
@ -1,44 +1,43 @@
 #!/usr/bin/env bash
 rm -f /var/lock/laravel_migration_underway \
-      /var/lock/laravel_migration_complete
+	/var/lock/laravel_migration_complete

-if [ "${MIGRATE_ENABLE,,}" = "on" ]; then
+if [[ ${MIGRATE_ENABLE,,} == "on" ]]; then

-  # Give a moment for services to wake up
-  echo "[MIGRATION] Waiting until Laravel Ready."
-  sleep 3
-  until [ -f /var/lock/laravel_ready ]
-  do
-       sleep 1
-  done
-  echo "[MIGRATION] Laravel is ready, running migrations..."
+	# Give a moment for services to wake up
+	echo "[MIGRATION] Waiting until Laravel Ready."
+	sleep 3
+	until [[ -f /var/lock/laravel_ready ]]; do
+		sleep 1
+	done
+	echo "[MIGRATION] Laravel is ready, running migrations..."

-  cd /app
+	cd /app || exit

-  # Run migration
-  touch /var/lock/laravel_migration_underway
+	# Run migration
+	touch /var/lock/laravel_migration_underway

-  if [ "${MIGRATE_CLEAN,,}" = "on" ]; then
-      php /app/artisan migrate:fresh --force
-      php /app/artisan migrate --force # First run will fail due to permissions. We can ignore, but need to migrate again to finish.
-  else
-      # If we run this on first commit, it is the same as migrate:fresh, first run may fail and we need to try one more time.
-      php /app/artisan migrate --force || php /app/artisan migrate --force
-  fi
+	if [[ ${MIGRATE_CLEAN,,} == "on" ]]; then
+		php /app/artisan migrate:fresh --force
+		php /app/artisan migrate --force # First run will fail due to permissions. We can ignore, but need to migrate again to finish.
+	else
+		# If we run this on first commit, it is the same as migrate:fresh, first run may fail and we need to try one more time.
+		php /app/artisan migrate --force || php /app/artisan migrate --force
+	fi

-  if [ "${SEEDERS,,}" = "on" ]; then
-    php /app/artisan db:seed -q
-  fi
+	if [[ ${SEEDERS,,} == "on" ]]; then
+		php /app/artisan db:seed -q
+	fi

-  rm /var/lock/laravel_migration_underway
-  touch /var/lock/laravel_migration_complete
-  echo "[MIGRATION] Migration complete!";
+	rm /var/lock/laravel_migration_underway
+	touch /var/lock/laravel_migration_complete
+	echo "[MIGRATION] Migration complete!"

 else
-  echo "[MIGRATION] Not enabled. Set MIGRATE_ENABLE = on to enable."
+	echo "[MIGRATION] Not enabled. Set MIGRATE_ENABLE = on to enable."
 fi

 # Sleep forever (and sleep again in case the sleep process is killed)
 while true; do
-  sleep infinity
-done
+	sleep infinity
+done
--- a/laravel/nginx.runit
+++ b/laravel/nginx.runit
@ -1,17 +1,17 @@
 #!/usr/bin/env bash

-if [ -z "${SSL_CERTIFICATE}" ]; then
-  echo "No certificate set, using defaults"
+if [[ -z ${SSL_CERTIFICATE} ]]; then
+	echo "No certificate set, using defaults"
 else
-  echo "Setting /certs/example.crt and /certs/example.key"
-  echo "${SSL_CERTIFICATE}" > /certs/example.crt
-  echo "${SSL_CERTIFICATE_KEY}" > /certs/example.key
+	echo "Setting /certs/example.crt and /certs/example.key"
+	echo "${SSL_CERTIFICATE}" >/certs/example.crt
+	echo "${SSL_CERTIFICATE_KEY}" >/certs/example.key
 fi

-if [ "${HTTP_ENABLE,,}" = "on" ]; then
-  echo "[NGINX] Starting Nginx"
-  /usr/sbin/nginx
+if [[ ${HTTP_ENABLE,,} == "on" ]]; then
+	echo "[NGINX] Starting Nginx"
+	/usr/sbin/nginx
 else
-  echo "[NGINX] HTTP_ENABLE not set, Nginx not running"
-  sleep infinity
-fi
+	echo "[NGINX] HTTP_ENABLE not set, Nginx not running"
+	sleep infinity
+fi
--- a/laravel/wait-for-mysql
+++ b/laravel/wait-for-mysql
@ -2,13 +2,13 @@
 MYSQL_HOST=${MYSQL_HOST:-"localhost"}
 MYSQL_PORT=${MYSQL_PORT:-3306}
 echo -n "Waiting for MySQL..."
-while ! mysqladmin ping -h"$MYSQL_HOST" -P"$MYSQL_PORT" --silent; do
-    sleep 1
-    echo -n "."
+while ! mysqladmin ping -h"${MYSQL_HOST}" -P"${MYSQL_PORT}" --silent; do
+	sleep 1
+	echo -n "."
 done
-sleep 1;
-while ! mysqladmin ping -h"$MYSQL_HOST" -P"$MYSQL_PORT" --silent; do
-    sleep 1
-    echo -n "."
+sleep 1
+while ! mysqladmin ping -h"${MYSQL_HOST}" -P"${MYSQL_PORT}" --silent; do
+	sleep 1
+	echo -n "."
 done
-echo -e "\nConnected to MySQL!"
+echo -e "\nConnected to MySQL!"
--- a/marshall/CODE_OF_CONDUCT.md
+++ b/marshall/CODE_OF_CONDUCT.md
@ -1,17 +1,20 @@
 This code of conduct outlines our expectations for participants within the open source community. Anyone who violates this code of conduct may be banned from contributing here.

 # Requirements
-* __Be friendly and patient.__
-* __Be welcoming__ _We strive to be a community that welcomes and supports people of all backgrounds and identities._
-* __Be respectful__ _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._
+
+- **Be friendly and patient.**
+- **Be welcoming** _We strive to be a community that welcomes and supports people of all backgrounds and identities._
+- **Be respectful** _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._

 # Unacceptable Behaviour
-* Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
-* Threats of violence, both physical and psycological.
-* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-* Continued communication after requests to cease.
+
+- Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
+- Threats of violence, both physical and psycological.
+- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+- Continued communication after requests to cease.

 # Interactions
-* Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
-* Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
-* We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
+
+- Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
+- Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
+- We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
--- a/marshall/Dockerfile
+++ b/marshall/Dockerfile
@ -1,4 +1,5 @@
-FROM ubuntu:focal
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
+FROM ubuntu:version

 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
      org.label-schema.vcs-url="https://github.com/benzine-framework/docker" \
@ -15,7 +16,7 @@ ENV DEBIAN_FRONTEND="teletype" \
    MARSHALL_BUILD_HOST=${MARSHALL_BUILD_HOST}

 WORKDIR /app
-SHELL ["/bin/bash", "-c"]
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV PATH="/app:/app/bin:/app/vendor/bin:${PATH}"
 ENV PS1="\[\e[31m\][\[\e[m\]\[\e[38;5;172m\]\u\[\e[m\]@\[\e[38;5;153m\]\h\[\e[m\] \[\e[38;5;214m\]\W\[\e[m\]\[\e[31m\]]\[\e[m\]\\$ "

@ -28,3 +29,6 @@ CMD ["/usr/bin/marshall"]
 RUN /installers/install && \
    rm -rf /marshall /installers && \
    chmod +x /usr/bin/marshall
+
+# Disable healthcheck, as healthcheck is nonsensical for this container.
+HEALTHCHECK NONE
--- a/marshall/LICENSE.md
+++ b/marshall/LICENSE.md
@ -1,190 +1,190 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for
 software and other kinds of works.

-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users. We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+any other work released this way by its authors. You can apply it to
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.

-  For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
 know their rights.

-  Developers that use the GNU GPL protect your rights with two steps:
+Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.

-  Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
 pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
+use, which is precisely where it is most unacceptable. Therefore, we
 have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
+products. If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.

-  Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
+make it effectively proprietary. To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.

-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.

                       TERMS AND CONDITIONS

-  0. Definitions.
+0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU General Public License.

-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.

-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.

-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.

-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.

-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.

-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.

-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.

-  1. Source Code.
+1. Source Code.

-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.

-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.

-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.

-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.

-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.

-  2. Basic Permissions.
+2. Basic Permissions.

-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.

-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.

-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.

-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.

-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.

-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@ -202,12 +202,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.

-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.

-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.

-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:

@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions:
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.

-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.

-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@ -290,75 +290,75 @@ in one of these ways:
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.

-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.

-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.

-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).

-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.

-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.

-  7. Additional Terms.
+7. Additional Terms.

-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.

-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.

-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:

@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms:
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.

-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.

-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.

-  8. Termination.
+8. Termination.

-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).

-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.

-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.

-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.

-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.

-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.

-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.

-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.

-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@ -460,43 +460,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.

-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.

-  11. Patents.
+11. Patents.

-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".

-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.

-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.

-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@ -504,13 +504,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.

-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@ -518,10 +518,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.

-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@ -533,73 +533,73 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.

-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.

-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.

-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+13. Use with the GNU Affero General Public License.

-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.

-  14. Revised Versions of this License.
+14. Revised Versions of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.

-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-  16. Limitation of Liability.
+16. Limitation of Liability.

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@ -609,9 +609,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.

-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.

-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@ -622,11 +622,11 @@ copy of the Program in return for a fee.

            How to Apply These Terms to Your New Programs

-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.

-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode:
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
+parts of the General Public License. Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".

-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/marshall/etc/service/cron/cron.runit
+++ b/marshall/etc/service/cron/cron.runit
@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/sbin/cron -f
+exec /usr/sbin/cron -f
--- a/marshall/etc/service/logrotate/logrotate.runit
+++ b/marshall/etc/service/logrotate/logrotate.runit
@ -1,2 +1 @@
 #!/bin/bash
-
--- a/marshall/etc/service/rsyslog/rsyslog.finish
+++ b/marshall/etc/service/rsyslog/rsyslog.finish
@ -0,0 +1,2 @@
+#!/bin/bash
+echo "Oh no! rsyslog has crashed!"
--- a/marshall/etc/service/rsyslog/rsyslog.runit
+++ b/marshall/etc/service/rsyslog/rsyslog.runit
@ -1,11 +1,11 @@
 #!/bin/sh
 SYSLOG_LOCATION=/var/log/syslog
-if [ ! -f $SYSLOG_LOCATION ]; then
-    touch $SYSLOG_LOCATION
+if [ ! -f "${SYSLOG_LOCATION}" ]; then
+	touch "${SYSLOG_LOCATION}"
 fi

-chmod 777 $SYSLOG_LOCATION
+chmod 777 "${SYSLOG_LOCATION}"

-service rsyslog start;
+service rsyslog start
 sleep 5
-tail -f $SYSLOG_LOCATION | sed --unbuffered 's|.*\[.*\]: ||g'
+tail -f "${SYSLOG_LOCATION}" | sed --unbuffered 's|.*\[.*\]: ||g'
--- a/marshall/installers/000_apt.sh
+++ b/marshall/installers/000_apt.sh
@ -1,21 +1,22 @@
 #!/bin/bash
+# shellcheck disable=SC1091,SC2312
 source /installers/config
-echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/force-unsafe-io
+echo "force-unsafe-io" >/etc/dpkg/dpkg.cfg.d/force-unsafe-io

 # We're gonna move the sources to .d/ubuntu.list, then copy it, then manipulate it for a mirror list.
-(
-  cat /etc/apt/sources.list;
-  cat /etc/apt/sources.list \
-    | sed 's/http\:\/\/archive\.ubuntu\.com\/ubuntu\//mirror\:\/\/mirrors.ubuntu.com\/mirrors.txt/g' \
-    | sed "s|deb http://security.ubuntu.com|# deb http://security.ubuntu.com|g"
-) \
-  | sed '/^#/d' \
-  | sed '/^$/d' \
-  > /etc/apt/sources.list.d/ubuntu.list
-rm /etc/apt/sources.list; touch /etc/apt/sources.list;
+#(
+#	cat /etc/apt/sources.list
+#	sed 's/http\:\/\/archive\.ubuntu\.com\/ubuntu\//mirror\:\/\/mirrors.ubuntu.com\/mirrors.txt/g' </etc/apt/sources.list |
+#		sed "s|deb http://security.ubuntu.com|# deb http://security.ubuntu.com|g"
+#) |
+#	sed '/^#/d' |
+#	sed '/^$/d' \
+#		>/etc/apt/sources.list.d/ubuntu.list
+#rm /etc/apt/sources.list
+#touch /etc/apt/sources.list

 # Remove duplicate sources
-sort /etc/apt/sources.list.d/ubuntu.list | uniq > /etc/apt/sources.list.d/ubuntu.list.uniq
+sort /etc/apt/sources.list.d/ubuntu.list | uniq >/etc/apt/sources.list.d/ubuntu.list.uniq
 mv /etc/apt/sources.list.d/ubuntu.list.uniq /etc/apt/sources.list.d/ubuntu.list

 # Update apt repos
@ -25,5 +26,5 @@ apt-get -qq update
 apt-get -yq upgrade

 # Install apt-utils & ca-certificates to prevent some screaming.
-$APT_GET ca-certificates
-$APT_GET apt apt-utils
+${APT_GET} ca-certificates
+${APT_GET} apt apt-utils
--- a/marshall/installers/001_bash.sh
+++ b/marshall/installers/001_bash.sh
@ -1,3 +1,4 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET bash
+${APT_GET} bash
--- a/marshall/installers/002_timezone.sh
+++ b/marshall/installers/002_timezone.sh
@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET tzdata
-echo $DEFAULT_TZ > /etc/timezone
+${APT_GET} tzdata
+echo "${DEFAULT_TZ}" >/etc/timezone
--- a/marshall/installers/003_dos2unix.sh
+++ b/marshall/installers/003_dos2unix.sh
@ -1,3 +1,4 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET dos2unix
+${APT_GET} dos2unix
--- a/marshall/installers/004_gpgagent.sh
+++ b/marshall/installers/004_gpgagent.sh
@ -1,3 +1,4 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET gpg-agent
+${APT_GET} gpg-agent
--- a/marshall/installers/050_runit.sh
+++ b/marshall/installers/050_runit.sh
@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET \
-    runit
+${APT_GET} \
+	runit
--- a/marshall/installers/100_cron.sh
+++ b/marshall/installers/100_cron.sh
@ -1,6 +1,7 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET cron
+${APT_GET} cron

 chmod 600 /etc/crontab

--- a/marshall/installers/101_rsyslog.sh
+++ b/marshall/installers/101_rsyslog.sh
@ -1,7 +1,9 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
-$APT_GET rsyslog
+${APT_GET} rsyslog

 mkdir -p /etc/service/rsyslog
 mv /etc/service/rsyslog/rsyslog.runit /etc/service/rsyslog/run
-chmod +x /etc/service/rsyslog/run
+mv /etc/service/rsyslog/rsyslog.finish /etc/service/rsyslog/finish
+chmod +x /etc/service/rsyslog/run /etc/service/rsyslog/finish
--- a/marshall/installers/102_logrotate.sh
+++ b/marshall/installers/102_logrotate.sh
@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p /etc/service/logrotate
 mv /etc/service/logrotate/logrotate.runit /etc/service/logrotate/run
-chmod +x /etc/service/logrotate/run
+chmod +x /etc/service/logrotate/run
--- a/marshall/installers/900_utils.sh
+++ b/marshall/installers/900_utils.sh
@ -1,12 +1,13 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config

-$APT_GET \
-    inetutils-ping \
-    nano \
-    host \
-    curl \
-    wget \
-    unzip \
-    ca-certificates \
-    jq
+${APT_GET} \
+	inetutils-ping \
+	nano \
+	host \
+	curl \
+	wget \
+	unzip \
+	ca-certificates \
+	jq
--- a/marshall/installers/901_package_report.sh
+++ b/marshall/installers/901_package_report.sh
@ -1,2 +1,2 @@
 #!/bin/bash
-chmod +x /usr/bin/package-report
+chmod +x /usr/bin/package-report
--- a/marshall/installers/999_cleanup.sh
+++ b/marshall/installers/999_cleanup.sh
@ -1,16 +1,17 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source /installers/config
 cd /
 apt-get remove -yqq \
-  perl
+	perl
 apt-get autoremove -y
 apt-get clean
 rm -rf \
-        /var/lib/apt/lists/* \
-        /tmp/* \
-        /var/tmp/* \
-        /var/cache/* \
-        /var/log/dpkg* \
-        /usr/share/doc \
-        /usr/share/doc-base \
-        /var/log/apt/term.log
+	/var/lib/apt/lists/* \
+	/tmp/* \
+	/var/tmp/* \
+	/var/cache/* \
+	/var/log/dpkg* \
+	/usr/share/doc \
+	/usr/share/doc-base \
+	/var/log/apt/term.log
--- a/marshall/installers/config
+++ b/marshall/installers/config
@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
-COLOUR_FAIL='\e[31m'
-COLOUR_SUCCESS='\e[32m'
-COLOUR_RESET='\e[0m'
-printf 'Running: %b%s%b\n' $COLOUR_SUCCESS "${0##*/}" $COLOUR_RESET
+export COLOUR_FAIL='\e[31m'
+export COLOUR_SUCCESS='\e[32m'
+export COLOUR_RESET='\e[0m'
+printf 'Running: %b%s%b\n' "${COLOUR_SUCCESS}" "${0##*/}" "${COLOUR_RESET}"

 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
-APT_GET='apt-get install -yqq --no-install-recommends '
+export APT_GET='apt-get install -yqq --no-install-recommends '
--- a/marshall/installers/install
+++ b/marshall/installers/install
@ -3,5 +3,5 @@ set -e
 cd "$(dirname "$0")"

 for file in *.sh; do
-  /bin/bash $file
-done
+	/bin/bash "${file}"
+done
--- a/marshall/usr/bin/package-report
+++ b/marshall/usr/bin/package-report
@ -1,5 +1,5 @@
-#!/bin/bash
-echo "Packages installed:":
-echo " KiloBytes\tPackage";
+#!/usr/bin/env bash
+printf "Packages installed:\n KiloBytes\tPackage\n"

-dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n | tac
+# shellcheck disable=SC2312
+dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n | tac | head -n 5
--- a/mitm-proxy/CODE_OF_CONDUCT.md
+++ b/mitm-proxy/CODE_OF_CONDUCT.md
@ -1,17 +1,20 @@
 This code of conduct outlines our expectations for participants within the open source community. Anyone who violates this code of conduct may be banned from contributing here.

 # Requirements
-* __Be friendly and patient.__
-* __Be welcoming__ _We strive to be a community that welcomes and supports people of all backgrounds and identities._
-* __Be respectful__ _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._
+
+- **Be friendly and patient.**
+- **Be welcoming** _We strive to be a community that welcomes and supports people of all backgrounds and identities._
+- **Be respectful** _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._

 # Unacceptable Behaviour
-* Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
-* Threats of violence, both physical and psycological.
-* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-* Continued communication after requests to cease.
+
+- Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
+- Threats of violence, both physical and psycological.
+- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+- Continued communication after requests to cease.

 # Interactions
-* Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
-* Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
-* We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
+
+- Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
+- Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
+- We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
--- a/mitm-proxy/Dockerfile
+++ b/mitm-proxy/Dockerfile
@ -1,6 +1,4 @@
-# From upstream redis
-# hadolint ignore=DL3007
-FROM mitmproxy/mitmproxy
+FROM mitmproxy:version
 ARG BUILD_DATE
 ARG GIT_SHA
 ARG MITM_VERSION
@ -38,6 +36,8 @@ RUN os=$(grep "^ID=" < /etc/os-release | cut -f2 -d'=') && \
      exit 1; \
    fi

+USER mitmproxy
+
 # Add healthcheck
 HEALTHCHECK --interval=30s --timeout=3s \
  CMD curl -I -x http://localhost:8080 -k https://www.google.com || exit 1
--- a/mitm-proxy/LICENSE.md
+++ b/mitm-proxy/LICENSE.md
@ -1,190 +1,190 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for
 software and other kinds of works.

-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users. We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+any other work released this way by its authors. You can apply it to
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.

-  For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
 know their rights.

-  Developers that use the GNU GPL protect your rights with two steps:
+Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.

-  Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
 pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
+use, which is precisely where it is most unacceptable. Therefore, we
 have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
+products. If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.

-  Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
+make it effectively proprietary. To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.

-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.

                       TERMS AND CONDITIONS

-  0. Definitions.
+0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU General Public License.

-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.

-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.

-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.

-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.

-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.

-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.

-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.

-  1. Source Code.
+1. Source Code.

-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.

-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.

-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.

-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.

-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.

-  2. Basic Permissions.
+2. Basic Permissions.

-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.

-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.

-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.

-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.

-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.

-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@ -202,12 +202,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.

-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.

-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.

-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:

@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions:
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.

-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.

-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@ -290,75 +290,75 @@ in one of these ways:
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.

-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.

-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.

-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).

-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.

-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.

-  7. Additional Terms.
+7. Additional Terms.

-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.

-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.

-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:

@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms:
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.

-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.

-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.

-  8. Termination.
+8. Termination.

-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).

-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.

-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.

-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.

-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.

-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.

-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.

-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.

-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@ -460,43 +460,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.

-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.

-  11. Patents.
+11. Patents.

-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".

-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.

-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.

-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@ -504,13 +504,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.

-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@ -518,10 +518,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.

-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@ -533,73 +533,73 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.

-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.

-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.

-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+13. Use with the GNU Affero General Public License.

-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.

-  14. Revised Versions of this License.
+14. Revised Versions of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.

-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-  16. Limitation of Liability.
+16. Limitation of Liability.

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@ -609,9 +609,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.

-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.

-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@ -622,11 +622,11 @@ copy of the Program in return for a fee.

            How to Apply These Terms to Your New Programs

-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.

-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode:
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
+parts of the General Public License. Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".

-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/mqtt/Dockerfile
+++ b/mqtt/Dockerfile
@ -1,4 +1,9 @@
-# hadolint ignore=DL3007
-FROM eclipse-mosquitto:latest
+FROM eclipse-mosquitto:injected-version

-COPY mosquitto.conf /mosquitto/config/mosquitto.conf
+COPY mosquitto.conf /mosquitto/config/mosquitto.conf
+
+RUN adduser -D mqtt
+USER mqtt
+
+HEALTHCHECK --interval=15s --timeout=3s --start-period=10s --retries=5 \
+    CMD mosquitto_sub -h localhost -t '$SYS/#' -C 1 -W 3
--- a/mysql-proxy/.hadolint.yaml
+++ b/mysql-proxy/.hadolint.yaml
@ -1,3 +0,0 @@
-ignored:
-  - DL3005
-  - DL3008
--- a/mysql-proxy/Dockerfile
+++ b/mysql-proxy/Dockerfile
@ -1,4 +1,4 @@
-FROM benzine/marshall:latest AS mysql-proxy
+FROM marshall:version AS mysql-proxy

 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
      org.label-schema.vcs-url="https://github.com/benzine-framework/docker" \
@ -8,13 +8,14 @@ ENV MYSQL_PROXY_VERSION 0.8.5
 ENV MYSQL_PROXY_TAR_NAME mysql-proxy-$MYSQL_PROXY_VERSION-linux-debian6.0-x86-64bit
 ENV DEBIAN_FRONTEND=noninteractive

-RUN apt-get update && \
+RUN adduser mysql && \
+    apt-get update && \
    apt-get upgrade -y ca-certificates tzdata && \
    apt-get -y install --no-install-recommends \
      wget \
      mysql-client \
    && \
-    wget https://downloads.mysql.com/archives/get/p/21/file/$MYSQL_PROXY_TAR_NAME.tar.gz && \
+    wget -q https://downloads.mysql.com/archives/get/p/21/file/$MYSQL_PROXY_TAR_NAME.tar.gz && \
    tar -xzvf $MYSQL_PROXY_TAR_NAME.tar.gz && \
    mv $MYSQL_PROXY_TAR_NAME /opt/mysql-proxy && \
    rm $MYSQL_PROXY_TAR_NAME.tar.gz && \
@ -22,38 +23,15 @@ RUN apt-get update && \
    apt-get autoremove -yqq && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/ && \
-    chown -R root:root /opt/mysql-proxy && \
-    printf "#!/bin/bash\n\
-\n\
-exec /opt/mysql-proxy/bin/mysql-proxy \\\\\n\
--keepalive \\\\\n\
--log-level=error \\\\\n\
--plugins=proxy \\\\\n\
--proxy-address=\${PROXY_DB_HOST}:\${PROXY_DB_PORT} \\\\\n\
--proxy-backend-addresses=\${REMOTE_DB_HOST}:\${REMOTE_DB_PORT} \\\\\n\
--proxy-lua-script=/opt/mysql-proxy/conf/main.lua\n\
-" >> /usr/local/bin//entrypoint.sh && \
-    chmod u+x /usr/local/bin/entrypoint.sh && \
-    ln -s /usr/local/bin/docker-entrypoint.sh /entrypoint.sh # shortcut
-
-HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=3 \
-    CMD mysqladmin ping -h 127.0.0.1 -p 3306 -u root || exit 1
-
-ENTRYPOINT [ "entrypoint.sh" ]
+    chown -R mysql:mysql /opt/mysql-proxy

 COPY main.lua /opt/mysql-proxy/conf/main.lua
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY healthcheck.sh /usr/local/bin/healthcheck.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh /usr/local/bin/healthcheck.sh
+CMD [ "/usr/local/bin/entrypoint.sh" ]

-# For another derived image:
+HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=3 \
+    CMD /usr/local/bin/healthcheck.sh || exit 1

-# --help-all
-# --proxy-backend-addresses=mysql:3306
-# --proxy-skip-profiling
-# --proxy-backend-addresses=host:port
-# --proxy-read-only-backend-addresses=host:port
-# --keepalive
-# --admin-username=User
-# --admin-password=Password
-# --log-level=crititcal
-# The log level to use when outputting error messages.
-# Messages with that level (or lower) are output.
-# For example, message level also outputs message with info, warning, and error levels.
+USER mysql
--- a/mysql-proxy/README.md
+++ b/mysql-proxy/README.md
@ -1,10 +1,11 @@
 # MySQL Proxy

-# Usage with docker-compose
+## Usage with docker-compose

 without
-```
-version: '2'
+
+```yaml
+version: "2"

 services:
  db:
@ -22,8 +23,9 @@ services:
 ```

 within
-```
-version: '2'
+
+```yaml
+version: "2"

 services:
  mysql:
@ -47,7 +49,7 @@ services:
    ports:
      - "3308:3306" #for external connection
    restart: always
-    volumes: 
+    volumes:
      - ../mysql-proxy-conf:/opt/mysql-proxy/conf
    environment:
      PROXY_DB_PORT: 3306
@ -58,9 +60,11 @@ services:
      - mysql
 ```

-# Query to stdout
+## Query to stdout
+
 For `docker-compose up` without `-d` (`../mysql-proxy/main.lua`)
-```
+
+```lua
 function read_query(packet)
   if string.byte(packet) == proxy.COM_QUERY then
 	print(string.sub(packet, 2))
@ -68,24 +72,23 @@ function read_query(packet)
 end
 ```

-# Query logging for mysql-proxy 
+## Query logging for mysql-proxy

-```
-...
-    volumes:
-      - ../mysql-proxy-conf:/opt/mysql-proxy/conf
-      - ../mysql-proxy-logs:/opt/mysql-proxy/logs
-    environment:
-      PROXY_DB_PORT: 3306
-      REMOTE_DB_HOST: mysql
-      REMOTE_DB_PORT: 3306
-      LUA_SCRIPT: "/opt/mysql-proxy/conf/log.lua"
-      LOG_FILE: "/opt/mysql-proxy/logs/mysql.log"
-...
+```yaml
+volumes:
+  - ../mysql-proxy-conf:/opt/mysql-proxy/conf
+  - ../mysql-proxy-logs:/opt/mysql-proxy/logs
+environment:
+  PROXY_DB_PORT: 3306
+  REMOTE_DB_HOST: mysql
+  REMOTE_DB_PORT: 3306
+  LUA_SCRIPT: "/opt/mysql-proxy/conf/log.lua"
+  LOG_FILE: "/opt/mysql-proxy/logs/mysql.log"
 ```

 `/mysql-proxy-conf/log.lua` https://gist.github.com/simonw/1039751
-```
+
+```lua
 local log_file = os.getenv("LOG_FILE")

 local fh = io.open(log_file, "a+")
@ -93,24 +96,26 @@ local fh = io.open(log_file, "a+")
 function read_query( packet )
    if string.byte(packet) == proxy.COM_QUERY then
        local query = string.sub(packet, 2)
-        fh:write( string.format("%s %6d -- %s \n", 
-            os.date('%Y-%m-%d %H:%M:%S'), 
-            proxy.connection.server["thread_id"], 
-            query)) 
+        fh:write( string.format("%s %6d -- %s \n",
+            os.date('%Y-%m-%d %H:%M:%S'),
+            proxy.connection.server["thread_id"],
+            query))
        fh:flush()
    end
 end
 ```
-# thanks
+
+## thanks

 https://hub.docker.com/r/zwxajh/mysql-proxy
 https://hub.docker.com/r/gediminaspuksmys/mysqlproxy/

-# logrotate
+## logrotate
+
 The image can be expand with `logrotate`
 Config file `/etc/logrotate.d/mysql-proxy` (approximate)

-```
+```text
 /opt/mysql-proxy/mysql.log {
 	weekly
 	missingok
@ -118,19 +123,21 @@ Config file `/etc/logrotate.d/mysql-proxy` (approximate)
 	compress
 	delaycompress
 	notifempty
-	create 666 root root 
+	create 666 root root
 	postrotate
 		/etc/init.d/mysql-proxy reload > /dev/null
 	endscript
 }
 ```

-# troubleshooting
+## troubleshooting
+
 If you can't create the chain `mysql` -> `mysql-proxy` -> `external client liten 0.0.0.0:3308`
 check extends ports on the `mysql` service and/or add `expose` directly
-```
-    expose:
-      - "3306" #for service mysql-proxy
+
+```yaml
+expose:
+  - "3306" #for service mysql-proxy
 ```

-> note: Log send to file with delay (buffering mechanism). You can restart the container for get the log immediately. 
+> note: Log send to file with delay (buffering mechanism). You can restart the container for get the log immediately.
--- a/mysql-proxy/docker-compose.yml
+++ b/mysql-proxy/docker-compose.yml
@ -0,0 +1,38 @@
+version: "3"
+
+services:
+  mysql:
+    image: mysql:8.0.0
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_DATABASE: dbuser
+      MYSQL_USER: dbuser
+      MYSQL_PASSWORD: password
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "127.0.0.1",
+          "-u",
+          "dbuser",
+          "-ppassword",
+        ]
+      interval: 5s
+      timeout: 20s
+      retries: 5
+  proxy:
+    build: .
+    restart: always
+    environment:
+      PROXY_DB_PORT: 3306
+      REMOTE_DB_HOST: mysql
+      REMOTE_DB_PORT: 3306
+      MYSQL_USER: dbuser
+      MYSQL_PASSWORD: password
+    depends_on:
+      mysql:
+        condition: service_healthy
--- a/mysql-proxy/entrypoint.sh
+++ b/mysql-proxy/entrypoint.sh
@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo "Starting MySQL Proxy..."
+echo "Configured to listen as ${PROXY_DB_HOST}:${PROXY_DB_PORT}"
+echo "Configured to forward to ${REMOTE_DB_HOST}:${REMOTE_DB_PORT}"
+exec /opt/mysql-proxy/bin/mysql-proxy \
+	--keepalive \
+	--log-level=error \
+	--plugins=proxy \
+	--proxy-address="${PROXY_DB_HOST}":"${PROXY_DB_PORT}" \
+	--proxy-backend-addresses="${REMOTE_DB_HOST}":"${REMOTE_DB_PORT}" \
+	--proxy-lua-script=/opt/mysql-proxy/conf/main.lua
--- a/mysql-proxy/healthcheck.sh
+++ b/mysql-proxy/healthcheck.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+export MYSQL_PWD="${MYSQL_PASSWORD}"
+mysqladmin ping \
+	-h "${PROXY_DB_HOST:-"127.0.0.1"}" \
+	-P "${PROXY_DB_PORT}" \
+	-u "${MYSQL_USER}"
--- a/node/CODE_OF_CONDUCT.md
+++ b/node/CODE_OF_CONDUCT.md
@ -1,17 +1,20 @@
 This code of conduct outlines our expectations for participants within the open source community. Anyone who violates this code of conduct may be banned from contributing here.

 # Requirements
-* __Be friendly and patient.__
-* __Be welcoming__ _We strive to be a community that welcomes and supports people of all backgrounds and identities._
-* __Be respectful__ _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._
+
+- **Be friendly and patient.**
+- **Be welcoming** _We strive to be a community that welcomes and supports people of all backgrounds and identities._
+- **Be respectful** _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._

 # Unacceptable Behaviour
-* Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
-* Threats of violence, both physical and psycological.
-* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-* Continued communication after requests to cease.
+
+- Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
+- Threats of violence, both physical and psycological.
+- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+- Continued communication after requests to cease.

 # Interactions
-* Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
-* Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
-* We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
+
+- Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
+- Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
+- We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
--- a/node/Dockerfile
+++ b/node/Dockerfile
@ -1,12 +1,12 @@
-# hadolint ignore=DL3007
-FROM benzine/marshall:latest AS nodejs
+FROM marshall:build AS nodejs

 ARG NODE_VERSION
 ARG YARN_VERSION
 ARG PATH="/app/node_modules/.bin:${PATH}"

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN mkdir ~/.gnupg && \
+RUN adduser node && \
+    mkdir ~/.gnupg && \
    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && \
    apt-get -qq update && \
    apt-get -yqq install --no-install-recommends \
@ -58,21 +58,27 @@ RUN mkdir ~/.gnupg && \
    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
  done \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
-  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && curl -fsSLO --compressed "https://github.com/yarnpkg/yarn/releases/download/v$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
  && mkdir -p /opt \
  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
-  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && rm yarn-v$YARN_VERSION.tar.gz \
  \
  && apt-get autoremove -y \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log

+# Healthcheck is nonsensical for this container.
+HEALTHCHECK NONE
+
+# Back to userland
+USER node
+
 FROM nodejs AS nodejs-compiler

+# Install dependencies
+USER root
 RUN apt-get -qq update && \
    apt-get -yqq install --no-install-recommends \
        python \
@ -81,3 +87,9 @@ RUN apt-get -qq update && \
    apt-get autoremove -y && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log
+
+# Healthcheck is nonsensical for this container.
+HEALTHCHECK NONE
+
+# Back to userland
+USER node
--- a/node/LICENSE.md
+++ b/node/LICENSE.md
@ -1,190 +1,190 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for
 software and other kinds of works.

-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users. We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+any other work released this way by its authors. You can apply it to
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.

-  For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
 know their rights.

-  Developers that use the GNU GPL protect your rights with two steps:
+Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.

-  Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
 pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
+use, which is precisely where it is most unacceptable. Therefore, we
 have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
+products. If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.

-  Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
+make it effectively proprietary. To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.

-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.

                       TERMS AND CONDITIONS

-  0. Definitions.
+0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU General Public License.

-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.

-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.

-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.

-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.

-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.

-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.

-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.

-  1. Source Code.
+1. Source Code.

-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.

-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.

-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.

-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.

-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.

-  2. Basic Permissions.
+2. Basic Permissions.

-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.

-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.

-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.

-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.

-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.

-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@ -202,12 +202,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.

-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.

-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.

-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:

@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions:
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.

-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.

-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@ -290,75 +290,75 @@ in one of these ways:
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.

-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.

-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.

-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).

-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.

-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.

-  7. Additional Terms.
+7. Additional Terms.

-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.

-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.

-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:

@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms:
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.

-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.

-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.

-  8. Termination.
+8. Termination.

-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).

-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.

-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.

-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.

-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.

-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.

-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.

-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.

-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@ -460,43 +460,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.

-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.

-  11. Patents.
+11. Patents.

-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".

-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.

-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.

-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@ -504,13 +504,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.

-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@ -518,10 +518,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.

-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@ -533,73 +533,73 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.

-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.

-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.

-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+13. Use with the GNU Affero General Public License.

-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.

-  14. Revised Versions of this License.
+14. Revised Versions of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.

-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-  16. Limitation of Liability.
+16. Limitation of Liability.

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@ -609,9 +609,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.

-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.

-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@ -622,11 +622,11 @@ copy of the Program in return for a fee.

            How to Apply These Terms to Your New Programs

-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.

-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode:
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
+parts of the General Public License. Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".

-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/php/CODE_OF_CONDUCT.md
+++ b/php/CODE_OF_CONDUCT.md
@ -1,17 +1,20 @@
 This code of conduct outlines our expectations for participants within the open source community. Anyone who violates this code of conduct may be banned from contributing here.

 # Requirements
-* __Be friendly and patient.__
-* __Be welcoming__ _We strive to be a community that welcomes and supports people of all backgrounds and identities._
-* __Be respectful__ _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._
+
+- **Be friendly and patient.**
+- **Be welcoming** _We strive to be a community that welcomes and supports people of all backgrounds and identities._
+- **Be respectful** _Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners._

 # Unacceptable Behaviour
-* Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
-* Threats of violence, both physical and psycological.
-* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-* Continued communication after requests to cease.
+
+- Offensive comments related to gender, sexual orientation, disability, mental illness, physical appearance, body size, race, age, regional discrimination, political or religious affiliation.
+- Threats of violence, both physical and psycological.
+- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+- Continued communication after requests to cease.

 # Interactions
-* Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
-* Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
-* We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
+
+- Don't just tell somebody they are wrong, or what they have done is wrong. You must always explain what is wrong, and why it is wrong.
+- Don't reject contributions that are partially complete and then go and commit your own version. Try to work with the author to complete their work.
+- We encourage everyone to participate and are committed to building a community for all, we seek to treat everyone both as fairly and equally as possible.
--- a/php/Dockerfile.Flavours
+++ b/php/Dockerfile.Flavours
@ -1,10 +1,68 @@
-ARG PHP_CORE_VERSION
-# hadolint ignore=DL3024
-FROM ${PHP_CORE_VERSION} AS php-cli
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
+FROM marshall:build AS php-core
 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"
+ARG PHP_PACKAGES
+ARG COMPOSER_VERSION
+ENV COMPOSER_ALLOW_SUPERUSER=1
+COPY core/install-report.sh /usr/bin/install-report
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN echo "Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
+    echo "Acquire::http::No-Cache=true;" > /etc/apt/apt.conf.d/80-no-cache && \
+    echo "Acquire::http::Pipeline-Depth=0;" > /etc/apt/apt.conf.d/80-no-pipeline && \
+    apt-get -qq update && \
+    apt-get -yqq upgrade && \
+    apt-get -yqq install --no-install-recommends \
+        python3-software-properties \
+        software-properties-common \
+        && \
+    echo "PHP packages to install:" && echo $PHP_PACKAGES && \
+    add-apt-repository -y ppa:ondrej/php && \
+    apt-get -qq update && \
+    apt-get -yqq install --no-install-recommends $PHP_PACKAGES  &&\
+    apt-get remove -yqq \
+        software-properties-common \
+        python-apt-common \
+        python3-software-properties \
+        python3.5 python3.5-minimal libpython3.5-minimal \
+        && \
+    apt-get autoremove -yqq && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \
+    rm -rf  /usr/bin/mariabackup \
+            /usr/bin/mysql_embedded \
+            /usr/bin/mysql_find_rows \
+            /usr/bin/mysql_fix_extensions \
+            /usr/bin/mysql_waitpid \
+            /usr/bin/mysqlaccess \
+            /usr/bin/mysqlanalyze \
+            /usr/bin/mysqlcheck \
+            /usr/bin/mysqldump \
+            /usr/bin/mysqldumpslow \
+            /usr/bin/mysqlimport \
+            /usr/bin/mysqloptimize \
+            /usr/bin/mysqlrepair \
+            /usr/bin/mysqlreport \
+            /usr/bin/mysqlshow \
+            /usr/bin/mysqlslap \
+            /usr/bin/mytop

+RUN chmod +x /usr/bin/install-report && \
+    /usr/bin/install-report
+
+RUN curl https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar --output /usr/local/bin/composer && \
+    chmod +x /usr/local/bin/composer /usr/bin/install-report && \
+    composer self-update
+
+# Healthcheck is nonsensical for this container.
+HEALTHCHECK NONE
+
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
+FROM php-core AS php-cli
+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"

 # Install a funky cool repl.
 RUN composer global require -q psy/psysh:@stable && \
@ -14,8 +72,11 @@ RUN composer global require -q psy/psysh:@stable && \

 COPY cli/psysh-config.php /root/.config/psysh/config.php

-ARG PHP_CORE_VERSION
-FROM ${PHP_CORE_VERSION} AS php-nginx
+RUN composer --version && \
+    repl --version
+
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
+FROM php-cli AS php-nginx
 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"
@ -26,10 +87,10 @@ ENV PHPFPM_MAX_CHILDREN=25
 COPY nginx /conf
 COPY self-signed-certificates /certs

+# ts:skip=AC_DOCKER_0002 Mis-detecting usage of apt instead of apt-get
 RUN apt-get -qq update && \
    # Install pre-dependencies to use apt-key.
    apt-get -yqq install --no-install-recommends \
-        sudo \
        lsb-core \
        gnupg \
        && \
@ -101,13 +162,15 @@ RUN apt-get -qq update && \
    mv /conf/php-fpm.runit /etc/service/php-fpm/run && \
    mv /conf/letsencrypt.runit /etc/service/letsencrypt/run && \
    #mv /conf/logs-letsencrypt.runit /etc/service/logs-letsencrypt/run && \
+    #mv /conf/logs-letsencrypt.finish /etc/service/logs-letsencrypt/finish && \
    mv /conf/logs-nginx-access.runit /etc/service/logs-nginx-access/run && \
    mv /conf/logs-nginx-error.runit /etc/service/logs-nginx-error/run && \
    mv /conf/logs-phpfpm-error.runit /etc/service/logs-phpfpm-error/run && \
+    mv /conf/logs-phpfpm-error.finish /etc/service/logs-phpfpm-error/finish && \
    # Make sure all our new services are using unix line endings
-    dos2unix -q /etc/service/*/run && \
+    dos2unix -q /etc/service/*/run /etc/service/*/finish && \
    # Make sure all our new services are executable
-    chmod +x /etc/service/*/run && \
+    chmod +x /etc/service/*/run /etc/service/*/finish && \
    # Cleanup the /conf dir
    rm -R /conf && \
    # Write the PHP version into some template locations
@ -133,12 +196,13 @@ VOLUME /etc/letsencrypt
 HEALTHCHECK --interval=30s --timeout=3s \
    CMD curl -f http://localhost/ || exit 1

-ARG PHP_CORE_VERSION
-FROM ${PHP_CORE_VERSION} AS php-apache
+# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
+FROM php-cli AS php-apache
 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"
 ARG PHP_VERSION
+# ts:skip=AC_DOCKER_0002 Mis-detecting usage of apt instead of apt-get
 RUN apt-get -qq update && \
    apt-get -yqq install --no-install-recommends \
        apache2 \
--- a/php/Dockerfile.Core
+++ b/php/Dockerfile.Core
@ -1,56 +0,0 @@
-# hadolint ignore=DL3007
-FROM benzine/marshall:latest AS php-core
-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"
-ARG PHP_PACKAGES
-ARG COMPOSER_UPDATE_FLAGS
-ENV COMPOSER_ALLOW_SUPERUSER=1
-COPY core/install-report.sh /usr/bin/install-report
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
-    echo "Acquire::http::No-Cache=true;" > /etc/apt/apt.conf.d/80-no-cache && \
-    echo "Acquire::http::Pipeline-Depth=0;" > /etc/apt/apt.conf.d/80-no-pipeline && \
-    apt-get -qq update && \
-    apt-get -yqq upgrade && \
-    apt-get -yqq install --no-install-recommends \
-        python3-software-properties \
-        software-properties-common \
-        && \
-    echo "PHP packages to install:" && echo $PHP_PACKAGES && \
-    add-apt-repository -y ppa:ondrej/php && \
-    apt-get -qq update && \
-    apt-get -yqq install --no-install-recommends $PHP_PACKAGES  &&\
-    apt-get remove -yqq \
-        software-properties-common \
-        python-apt-common \
-        python3-software-properties \
-        python3.5 python3.5-minimal libpython3.5-minimal \
-        && \
-    apt-get autoremove -yqq && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \
-    rm -rf  /usr/bin/mariabackup \
-            /usr/bin/mysql_embedded \
-            /usr/bin/mysql_find_rows \
-            /usr/bin/mysql_fix_extensions \
-            /usr/bin/mysql_waitpid \
-            /usr/bin/mysqlaccess \
-            /usr/bin/mysqlanalyze \
-            /usr/bin/mysqlcheck \
-            /usr/bin/mysqldump \
-            /usr/bin/mysqldumpslow \
-            /usr/bin/mysqlimport \
-            /usr/bin/mysqloptimize \
-            /usr/bin/mysqlrepair \
-            /usr/bin/mysqlreport \
-            /usr/bin/mysqlshow \
-            /usr/bin/mysqlslap \
-            /usr/bin/mytop
-
-RUN chmod +x /usr/bin/install-report && \
-    /usr/bin/install-report
-
-RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
-    chmod +x /usr/local/bin/composer /usr/bin/install-report && \
-    composer self-update ${COMPOSER_UPDATE_FLAGS}
--- a/php/LICENSE.md
+++ b/php/LICENSE.md
@ -1,190 +1,190 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for
 software and other kinds of works.

-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users. We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+any other work released this way by its authors. You can apply it to
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.

-  For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
 know their rights.

-  Developers that use the GNU GPL protect your rights with two steps:
+Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.

-  Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
 pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
+use, which is precisely where it is most unacceptable. Therefore, we
 have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
+products. If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.

-  Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
+make it effectively proprietary. To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.

-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.

                       TERMS AND CONDITIONS

-  0. Definitions.
+0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU General Public License.

-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.

-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.

-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.

-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.

-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.

-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.

-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.

-  1. Source Code.
+1. Source Code.

-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.

-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.

-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.

-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.

-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.

-  2. Basic Permissions.
+2. Basic Permissions.

-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.

-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.

-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.

-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.

-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.

-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@ -202,12 +202,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.

-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.

-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.

-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:

@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions:
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.

-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.

-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.

-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@ -290,75 +290,75 @@ in one of these ways:
    Source of the work are being offered to the general public at no
    charge under subsection 6d.

-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.

-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.

-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.

-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).

-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.

-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.

-  7. Additional Terms.
+7. Additional Terms.

-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.

-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.

-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:

@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms:
    any liability that these contractual assumptions directly impose on
    those licensors and authors.

-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.

-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.

-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.

-  8. Termination.
+8. Termination.

-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).

-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.

-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.

-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.

-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.

-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.

-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.

-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.

-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@ -460,43 +460,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.

-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.

-  11. Patents.
+11. Patents.

-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".

-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.

-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.

-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@ -504,13 +504,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.

-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@ -518,10 +518,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.

-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@ -533,73 +533,73 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.

-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.

-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.

-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+13. Use with the GNU Affero General Public License.

-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.

-  14. Revised Versions of this License.
+14. Revised Versions of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.

-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-  16. Limitation of Liability.
+16. Limitation of Liability.

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@ -609,9 +609,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.

-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.

-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@ -622,11 +622,11 @@ copy of the Program in return for a fee.

            How to Apply These Terms to Your New Programs

-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.

-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

    <program>  Copyright (C) <year>  <name of author>
@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode:
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
+parts of the General Public License. Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".

-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/Show more
+++ b/Show more