feat: BREAKING CHANGE - overhaul

.env.example

@@ -0,0 +1,9 @@
+PUID=1000
+PGID=1000
+TZ=Europe/London
+
+NGINX_CLIENT_MAX_BODY_SIZE=32m
+ROBOTS_DISALLOW=false
+
+GRAV_PLUGINS=admin
+GRAV_MULTISITE=none

.github/workflows/build.yml

@@ -1,137 +1,88 @@
+---
 name: Build
 
-on:
-  schedule:
-    # Everyday at 01:00am
-    - cron: '0 1 * * *'
+on: # yamllint disable-line rule:truthy
   workflow_dispatch:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main
 
+concurrency:
+  group: build-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  docker-validate:
-    strategy:
-      matrix:
-        tag: [core, admin]
-    timeout-minutes: 10
+  build-test:
+    name: Build & Test
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run Docker Lint
-        uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: Dockerfile.grav${{ matrix.tag }}
-
-  docker-build-pr:
-    if: github.event_name == 'pull_request'
-    needs:
-      - docker-validate
     strategy:
       matrix:
-        tag: [core, admin]
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
+        platform: [amd64, arm64]
     steps:
-      - name: Checkout code
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Get Date
-        run: |
-          DATE=$(date +"%Y%m%d")
-          echo "${DATE}"
-          echo "DATE=${DATE}" >> $GITHUB_ENV
-
       - name: Get GRAV Version
         run: |
           GRAV_VERSION=$(curl -sL "https://github.com/gitapi/repos/getgrav/grav/releases/latest" | grep tag_name | cut -d '"' -f 4)
           echo "${GRAV_VERSION}"
           echo "GRAV_VERSION=${GRAV_VERSION}" >> $GITHUB_ENV
 
-      - name: Generate Docker Metadata
-        id: docker-meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            dsavell/grav
-          tags: |
-            type=raw,value=${{ matrix.tag }}
-            type=raw,value=${{ matrix.tag }}-${{ env.GRAV_VERSION }}
-            type=raw,value=${{ matrix.tag }}-${{ env.DATE }}
-            type=raw,value=${{ matrix.tag }}-${{ env.GRAV_VERSION }}-${{ env.DATE }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Build only
+      - name: Docker - Build
         uses: docker/build-push-action@v5
         with:
-          context: .
-          file: Dockerfile.grav${{ matrix.tag }}
-          push: false
-          tags: ${{ steps.docker-meta.outputs.tags }}
-          labels: ${{ steps.docker-meta.outputs.labels }}
+          file: ./Dockerfile
+          platforms: linux/${{ matrix.platform }}
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ github.run_id }}:${{ matrix.platform }}
           build-args: |
             GRAV_VERSION=${{ env.GRAV_VERSION }}
 
-  docker-build-main:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-    needs:
-      - docker-validate
-    strategy:
-      matrix:
-        tag: [core, admin]
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Get Date
+      - name: Docker - Run
         run: |
-          DATE=$(date +"%Y%m%d")
-          echo "${DATE}"
-          echo "DATE=${DATE}" >> $GITHUB_ENV
+          docker run -d \
+            --platform linux/${{ matrix.platform }} \
+            --name=grav_test \
+            -p 127.0.0.1:80:80/tcp \
+            --env-file .env.example \
+            -v ./grav/backup:/grav/backup \
+            -v ./grav/user:/grav/user \
+            ${{ github.run_id }}:${{ matrix.platform }}
 
-      - name: Get GRAV Version
+      - name: Test - Listening Port 80
         run: |
-          GRAV_VERSION=$(curl -sL "https://github.com/gitapi/repos/getgrav/grav/releases/latest" | grep tag_name | cut -d '"' -f 4)
-          echo "${GRAV_VERSION}"
-          echo "GRAV_VERSION=${GRAV_VERSION}" >> $GITHUB_ENV
+          sleep 5s
+          nc -z -v 127.0.0.1 80 || exit 1
 
-      - name: Generate Docker Metadata
-        id: docker-meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            dsavell/grav
-          tags: |
-            type=raw,value=${{ matrix.tag }}
-            type=raw,value=${{ matrix.tag }}-${{ env.GRAV_VERSION }}
-            type=raw,value=${{ matrix.tag }}-${{ env.DATE }}
-            type=raw,value=${{ matrix.tag }}-${{ env.GRAV_VERSION }}-${{ env.DATE }}
+      - name: Test - Webpage access
+        run: |
+          sleep 20s
+          if curl -v --silent 127.0.0.1:80/admin | grep Grav; then
+            echo "Grav webpage accessible"
+          else
+            exit 2
+          fi
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Test - Update plugins function
+        run: |
+          if docker exec grav_test update-plugins | grep 'Nothing to update'; then
+            echo "Grav update plugins function OK"
+          else
+            exit 3
+          fi
 
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfile.grav${{ matrix.tag }}
-          push: true
-          tags: ${{ steps.docker-meta.outputs.tags }}
-          labels: ${{ steps.docker-meta.outputs.labels }}
-          build-args: |
-            GRAV_VERSION=${{ env.GRAV_VERSION }}
+      - name: Test - Backup function
+        run: |
+          if docker exec grav_test backup | grep 'Backup Successfully Created'; then
+            echo "Grav backup successfull"
+          else
+            exit 4
+          fi

.github/workflows/lint.yml

@@ -0,0 +1,63 @@
+---
+name: Lint
+
+on: # yamllint disable-line rule:truthy
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: lint-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Shellcheck
+        uses: ludeeus/action-shellcheck@2.0.0
+
+  markdownlint:
+    name: Markdownlint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Markdownlint
+        uses: DavidAnson/markdownlint-cli2-action@v15
+        with:
+          config: '.markdownlint.jsonc'
+          globs: '**/*.md'
+
+  yamllint:
+    name: Yamllint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Yamllint
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          config_file: .yamllint.yml
+
+  dockerlint:
+    name: Dockerlint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Hadolint
+        uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: Dockerfile

.github/workflows/release.yml

@@ -0,0 +1,71 @@
+---
+name: Release
+
+on: # yamllint disable-line rule:truthy
+  schedule:
+    - cron: '0 1 * * 0' # At 01:00 on Sunday
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get Date
+        run: |
+          DATE=$(date +"%Y%m%d")
+          echo "${DATE}"
+          echo "DATE=${DATE}" >> $GITHUB_ENV
+
+      - name: Get GRAV Version
+        run: |
+          GRAV_VERSION=$(curl -sL "https://github.com/gitapi/repos/getgrav/grav/releases/latest" | grep tag_name | cut -d '"' -f 4)
+          echo "${GRAV_VERSION}"
+          echo "GRAV_VERSION=${GRAV_VERSION}" >> $GITHUB_ENV
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Generate Docker Metadata
+        id: docker-meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            dsavell/grav
+            ghcr.io/dsavell/grav
+          tags: |
+            type=raw,value=${{ env.GRAV_VERSION }}
+            type=raw,value=${{ env.GRAV_VERSION }}-${{ env.DATE }}
+
+      - name: Docker - Build & Push
+        uses: docker/build-push-action@v5
+        with:
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.docker-meta.outputs.tags }}
+          labels: ${{ steps.docker-meta.outputs.labels }}
+          build-args: |
+            GRAV_VERSION=${{ env.GRAV_VERSION }}