Merge pull request #7 from linuxserver/develop-initial

Author: thespad

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-plex-meta-manager/edit/main/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-plex-meta-manager/edit/develop/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-plex-meta-manager)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-plex-meta-manager/tree/main/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-plex-meta-manager/tree/develop/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-plex-meta-manager/blob/main/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-plex-meta-manager/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.github/workflows/external_trigger.yml

@@ -4,24 +4,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-main:
+  external-trigger-develop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/develop'
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_MAIN }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_MAIN is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_DEVELOP is set; skipping trigger. ****"
             exit 0
           fi
-          echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_MAIN\". ****"
+          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_META_MANAGER_DEVELOP\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases/latest" | jq -r '. | .tag_name')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/meisnate12/Plex-Meta-Manager/commits/develop" | jq -r '. | .sha' | cut -c1-8)
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for plex-meta-manager branch main"
+            FAILURE_REASON="Can't retrieve external version for plex-meta-manager branch develop"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-plex-meta-manager/actions/runs/${{ github.run_id }}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -32,7 +32,7 @@ jobs:
           echo "**** External version: ${EXT_RELEASE} ****"
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/plex-meta-manager"
-          tag="latest"
+          tag="develop"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fplex-meta-manager%3Apull" \
             | jq -r '.token')
@@ -54,7 +54,7 @@ jobs:
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for plex-meta-manager tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for plex-meta-manager tag develop"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -64,13 +64,13 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
             response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/main/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/develop/buildWithParameters?PACKAGE_CHECK=false \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
             echo "**** Jenkins job queue url: ${response%$'\r'} ****"
             echo "**** Sleeping 10 seconds until job starts ****"
@@ -85,7 +85,7 @@ jobs:
               --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
               --data-urlencode "Submit=Submit"
             echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for plex-meta-manager tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for plex-meta-manager tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
               "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex-meta-manager/blob/main/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-plex-meta-manager/blob/main/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex-meta-manager/blob/main/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex-meta-manager/blob/develop/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-plex-meta-manager/blob/develop/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex-meta-manager/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -4,25 +4,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-trigger-main:
+  package-trigger-develop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
 
       - name: Package Trigger
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/develop'
         run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_MAIN }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_MAIN is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_DEVELOP is set; skipping trigger. ****"
             exit 0
           fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
             exit 0
           fi
-          echo "**** Package trigger running off of main branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_MAIN\". ****"
+          echo "**** Package trigger running off of develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_META_MANAGER_DEVELOP\". ****"
           response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/main/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/develop/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
           echo "**** Jenkins job queue url: ${response%$'\r'} ****"
           echo "**** Sleeping 10 seconds until job starts ****"

Dockerfile

@@ -30,13 +30,13 @@ RUN \
     python3 \
     py3-pip && \
   if [ -z ${PMM_VERSION+x} ]; then \
-    PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
-      | jq -r 'first(.[]) | .tag_name'); \
+    PMM_VERSION=$(curl -s "https://api.github.com/repos/meisnate12/Plex-Meta-Manager/commits/develop" \
+      | jq -r '. | .sha' | cut -c1-8); \
   fi && \
   mkdir -p /app/pmm && \
   curl -o \
     /tmp/pmm.tar.gz -L \
-    "https://github.com/meisnate12/Plex-Meta-Manager/archive/refs/tags/${PMM_VERSION}.tar.gz" && \
+    "https://github.com/meisnate12/Plex-Meta-Manager/archive/${PMM_VERSION}.tar.gz" && \
   tar xf \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \

Dockerfile.aarch64

@@ -26,17 +26,17 @@ RUN \
   apk add  -U --update --no-cache \
     grep \
     libjpeg \
-    libxslt \    
+    libxslt \
     python3 \
     py3-pip && \
   if [ -z ${PMM_VERSION+x} ]; then \
-    PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
-      | jq -r 'first(.[]) | .tag_name'); \
+    PMM_VERSION=$(curl -s "https://api.github.com/repos/meisnate12/Plex-Meta-Manager/commits/develop" \
+      | jq -r '. | .sha' | cut -c1-8); \
   fi && \
   mkdir -p /app/pmm && \
   curl -o \
     /tmp/pmm.tar.gz -L \
-    "https://github.com/meisnate12/Plex-Meta-Manager/archive/refs/tags/${PMM_VERSION}.tar.gz" && \
+    "https://github.com/meisnate12/Plex-Meta-Manager/archive/${PMM_VERSION}.tar.gz" && \
   tar xf \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \

Dockerfile.armhf

@@ -26,17 +26,17 @@ RUN \
   apk add  -U --update --no-cache \
     grep \
     libjpeg \
-    libxslt \    
+    libxslt \
     python3 \
     py3-pip && \
   if [ -z ${PMM_VERSION+x} ]; then \
-    PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
-      | jq -r 'first(.[]) | .tag_name'); \
+    PMM_VERSION=$(curl -s "https://api.github.com/repos/meisnate12/Plex-Meta-Manager/commits/develop" \
+      | jq -r '. | .sha' | cut -c1-8); \
   fi && \
   mkdir -p /app/pmm && \
   curl -o \
     /tmp/pmm.tar.gz -L \
-    "https://github.com/meisnate12/Plex-Meta-Manager/archive/refs/tags/${PMM_VERSION}.tar.gz" && \
+    "https://github.com/meisnate12/Plex-Meta-Manager/archive/${PMM_VERSION}.tar.gz" && \
   tar xf \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \