Merge pull request #676 from linuxserver/swag-auto-reload-update

swag-auto-reload update/add workflows

.github/workflows/BuildImage.yml

@@ -1,62 +1,45 @@
 name: Build Image
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request_target, workflow_dispatch]
 
 env:
-  ENDPOINT: "linuxserver/mods"
+  GITHUB_REPO: "linuxserver/docker-mods" #don't modify
-  BASEIMAGE: "swag"
+  ENDPOINT: "linuxserver/mods" #don't modify
-  MODNAME: "auto-reload"
+  BASEIMAGE: "swag" #replace
+  MODNAME: "auto-reload" #replace
 
 jobs:
-  build:
+  set-vars:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - name: Set Vars
-
+        id: outputs
-      - name: Build image
         run: |
-          docker build --no-cache -t ${{ github.sha }} .
+          echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT
+          echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT
+          echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
+          echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
+          # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
+          MOD_VERSION=""
+          echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
+    outputs:
+      GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}
+      ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }}
+      BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }}
+      MODNAME: ${{ steps.outputs.outputs.MODNAME }}
+      MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }}
 
-      - name: Tag image
+  build:
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
+    uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1
-        run: |
+    needs: set-vars
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+    secrets:
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
+      CR_USER: ${{ secrets.CR_USER }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+      CR_PAT: ${{ secrets.CR_PAT }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
+      DOCKERUSER: ${{ secrets.DOCKERUSER }}
-
+      DOCKERPASS: ${{ secrets.DOCKERPASS }}
-      - name: Credential check
+    with:
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
+      GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }}
-        run: |
+      ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }}
-          echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
+      BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }}
-          echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
+      MODNAME: ${{ needs.set-vars.outputs.MODNAME }}
-          echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV
+      MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }}
-          echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV
-          if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then
-            echo "::error::Push credential secrets missing."
-            echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings."
-            echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions."
-            exit 1
-          fi
-
-      - name: Login to GitHub Container Registry
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
-        run: |
-          echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
-
-      - name: Push tags to GitHub Container Registry
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
-        run: |
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
-
-      - name: Login to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
-
-      - name: Push tags to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}

.github/workflows/call_issue_pr_tracker.yml

@@ -0,0 +1,16 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled,closed]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit

.github/workflows/permissions.yml

@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

Dockerfile

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM scratch
 
 LABEL maintainer="aptalca"

root/etc/cont-init.d/98-inotify

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-apk add --no-cache inotify-tools

root/etc/services.d/inotify/run

@@ -1,32 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-echo "MOD Auto-reload: Watching the following files/folders for changes (excluding .sample and .md files):"
-echo "/config/nginx"
-ACTIVE_WATCH=("/config/nginx")
-for i in $(echo "${WATCHLIST}" | tr "|" " "); do
-  if [ -f "${i}" ] || [ -d "${i}" ]; then
-    echo "${i}"
-    ACTIVE_WATCH+=("${i}")
-  fi
-done
-
-function wait_for_changes {
-  inotifywait -rq \
-    --event modify,move,create,delete \
-    --excludei '\.(sample|md)' \
-    "${ACTIVE_WATCH[@]}"
-}
-
-while wait_for_changes; do
-  NGINX_CONF=()
-  if ! grep -q "/config/nginx/nginx.conf" /etc/nginx/nginx.conf; then
-    NGINX_CONF=("-c" "/config/nginx/nginx.conf")
-  fi
-  if /usr/sbin/nginx "${NGINX_CONF[@]}" -t; then
-    echo "Changes to nginx config detected and the changes are valid, reloading nginx"
-    /usr/sbin/nginx "${NGINX_CONF[@]}" -s reload
-  else
-    echo "Changes to nginx config detected but the changes are not valid, skipping nginx reload. Please fix your config."
-  fi
-done