Merge pull request #683 from linuxserver/swag-geoip2influx-update

swag-geoip2influx 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:
+  GITHUB_REPO: "linuxserver/docker-mods" #don't modify
   ENDPOINT: "linuxserver/mods" #don't modify
   BASEIMAGE: "swag" #replace
   MODNAME: "geoip2influx" #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,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
 
 ADD https://raw.githubusercontent.com/gilbN/geoip2influx/master/geoip2influx.py /root-layer/geoip2influx/geoip2influx.py
 COPY root/ /root-layer/

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

@@ -1,43 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /usr/lib/python3.8/site-packages/influxdb ]; then
-  echo '-------------------------------------------------------------'
-  echo '| Mod by Gilbn                                              |'
-  echo '| Running installation of required modules for Geoip2Influx |'
-  echo '-------------------------------------------------------------'
-  pip3 install --no-cache-dir -U \
-    geoip2==3.0.0 \
-    geohash2==1.1 \
-    influxdb==5.3.0 \
-    IPy==1.0
-fi
-
-# Create log folder
-mkdir -p \
-  /config/log/geoip2influx
-# move old log if needed
-if [ -f /config/geoip2db/geoip2influx.log ]; then
-  mv /config/geoip2db/geoip2influx.log /config/log/geoip2influx
-fi
-
-# permissions
-chown -R abc:abc \
-  /geoip2influx \
-  /config/log/geoip2influx
-
-chmod +x /geoip2influx/geoip2influx.py
-
-# Display variables for troubleshooting
-echo -e "Variables set:\\n\
-NGINX_LOG_PATH=${NGINX_LOG_PATH}\\n\
-INFLUX_HOST=${INFLUX_HOST}\\n\
-INFLUX_HOST_PORT=${INFLUX_HOST_PORT}\\n\
-INFLUX_DATABASE=${INFLUX_DATABASE}\\n\
-INFLUX_USER=${INFLUX_USER}\\n\
-INFLUX_PASS=${INFLUX_PASS}\\n\
-INFLUX_RETENTION=${INFLUX_RETENTION}\\n\
-INFLUX_SHARD=${INFLUX_SHARD}\\n\
-GEO_MEASUREMENT=${GEO_MEASUREMENT}\\n\
-LOG_MEASUREMENT=${LOG_MEASUREMENT}\\n\
-SEND_NGINX_LOGS=${SEND_NGINX_LOGS}\\n\
-GEOIP2INFLUX_LOG_LEVEL=${GEOIP2INFLUX_LOG_LEVEL}\\n"

root/etc/s6-overlay/s6-rc.d/init-mod-swag-geoip2influx-add-package/run

@@ -21,7 +21,7 @@ if [ -f /config/geoip2db/geoip2influx.log ]; then
 fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
   /geoip2influx \
   /config/log/geoip2influx
 

root/etc/services.d/geoip2influx/run

@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-  exec \
-        python3 /geoip2influx/geoip2influx.py