Bot Updating Package Versions

Rebase to Alpine 3.19

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.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-pyload-ng/edit/main/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-pyload-ng/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-pyload-ng)
@@ -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-pyload-ng/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-pyload-ng/tree/develop/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: linuxserver
 open_collective: linuxserver
+custom: ["https://PayPal.Me/nitzo2001/0usd",]

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- Provide a general summary of the bug in the Title above -->
-
-------------------------------
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Environment
-**OS:**
-**CPU architecture:** x86_64/arm32/arm64
-**How docker service was installed:**
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Command used to create docker container (run/create/compose/screenshot)
-<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
-
-## Docker logs
-<!--- Provide a full docker log, output of "docker logs pyload-ng" -->

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -0,0 +1,76 @@
+# Based on the issue template
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG] <title>"
+labels: [Bug]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Tell us what should happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **How docker service was installed**: distro's packagemanager
+      value: |
+        - OS:
+        - How docker service was installed:
+      render: markdown
+    validations:
+      required: false
+  - type: dropdown
+    attributes:
+      label: CPU architecture
+      options:
+        - x86-64
+        - arm64
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Docker creation
+      description: |
+        Command used to create docker container
+        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      description: |
+        Provide a full docker log, output of "docker logs linuxserver.io"
+      label: Container logs
+      placeholder: |
+        Output of `docker logs linuxserver.io`
+      render: bash
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
-<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
-
-<!--- Provide a general summary of the request in the Title above -->
-
-------------------------------
-
-## Desired Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Alternatives Considered
-<!--- Tell us what other options you have tried or considered -->

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -0,0 +1,31 @@
+# Based on the issue template
+name: Feature request
+description: Suggest an idea for this project
+title: "[FEAT] <title>"
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this a new feature request?
+      description: Please search to see if a feature request already exists.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Wanted change
+      description: Tell us what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reason for change
+      description: Justify your request, why do you want it, what is the benefit.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed code change
+      description: Do you have a potential code change in mind?
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-pyload-ng/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-pyload-ng/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.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/call_issues_cron.yml

@@ -0,0 +1,13 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron:  '23 14 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.github/workflows/external_trigger.yml

@@ -4,24 +4,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-main:
+  external-trigger-develop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/develop'
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_MAIN }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_MAIN is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_MAIN\". ****"
+          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_DEVELOP\". ****"
+          echo "External trigger running off of develop branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PYLOAD_NG_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/pyload-ng/json" |jq -r '. | .info.version')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/pyload/pyload/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 pyload-ng branch main"
+            FAILURE_REASON="Can't retrieve external version for pyload-ng branch develop"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-pyload-ng/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"}],
@@ -30,9 +32,10 @@ jobs:
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
           echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/pyload-ng"
-          tag="latest"
+          tag="develop"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fpyload-ng%3Apull" \
             | jq -r '.token')
@@ -48,29 +51,37 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           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 pyload-ng tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for pyload-ng 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 }}
             exit 1
           fi
           echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/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 ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
             response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/main/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/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 ****"
@@ -78,6 +89,7 @@ jobs:
             buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
             buildurl="${buildurl%$'\r'}"
             echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
             echo "**** Attempting to change the Jenkins job description ****"
             curl -iX POST \
               "${buildurl}submitDescription" \
@@ -85,7 +97,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 pyload-ng tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for pyload-ng 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/external_trigger_scheduler.yml

@@ -2,14 +2,14 @@ name: External Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '54 * * * *'
+    - cron:  '59 * * * *'
   workflow_dispatch:
 
 jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 
@@ -17,18 +17,18 @@ jobs:
         run: |
           echo "**** Branches found: ****"
           git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
           for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
             br=$(echo "$br" | sed 's|origin/||g')
             echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            if [ "$br" == "$ls_branch" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/jenkins-vars.yml)
+            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
+            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
+            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
+              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
                 echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
@@ -36,8 +36,10 @@ jobs:
                   https://api.github.com/repos/linuxserver/docker-pyload-ng/actions/workflows/external_trigger.yml/dispatches
               else
                 echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.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-pyload-ng/blob/main/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-pyload-ng/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-pyload-ng/blob/main/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-pyload-ng/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -4,25 +4,28 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-trigger-main:
+  package-trigger-develop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: Package Trigger
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/develop'
         run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_MAIN }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_MAIN is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "**** Package trigger running off of main branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_MAIN\". ****"
+          echo "**** Package trigger running off of develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_DEVELOP\". ****"
+          echo "Package trigger running off of develop branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_PYLOAD_NG_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
           response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/main/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/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 ****"
@@ -30,6 +33,7 @@ jobs:
           buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
           buildurl="${buildurl%$'\r'}"
           echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
           echo "**** Attempting to change the Jenkins job description ****"
           curl -iX POST \
             "${buildurl}submitDescription" \

.github/workflows/package_trigger_scheduler.yml

@@ -2,14 +2,14 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '44 14 * * 2'
+    - cron:  '9 19 * * 5'
   workflow_dispatch:
 
 jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 
@@ -17,18 +17,16 @@ jobs:
         run: |
           echo "**** Branches found: ****"
           git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
           for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
             br=$(echo "$br" | sed 's|origin/||g')
             echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/jenkins-vars.yml | yq -r '.ls_branch')
             if [ "${br}" == "${ls_branch}" ]; then
               echo "**** Branch ${br} appears to be live; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-pyload-ng/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
                 echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 triggered_branches="${triggered_branches}${br} "
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
@@ -38,9 +36,11 @@ jobs:
                 sleep 30
               else
                 echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
               echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done
           echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"

.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

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v3
-      with:
-        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        days-before-stale: 30
-        days-before-close: 365
-        exempt-issue-labels: 'awaiting-approval,work-in-progress'
-        exempt-pr-labels: 'awaiting-approval,work-in-progress'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,9 +1,13 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:latest as unrar
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG PYLOAD_VERSION
+ARG PYLOAD_COMMIT
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
@@ -15,6 +19,7 @@ RUN \
     build-base \
     cargo \
     curl-dev \
+    git \
     libffi-dev \
     libjpeg-turbo-dev \
     openssl-dev \
@@ -22,32 +27,23 @@ RUN \
     zlib-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    curl \
+    ffmpeg \
     libjpeg-turbo \
-    py3-pip \
+    7zip \
     python3 \
     sqlite \
     tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
   echo "**** install pyload ****" && \
-  if [ -z ${PYLOAD_VERSION+x} ]; then \
-    PYLOAD="pyload-ng[all]"; \
-  else \
-    PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
+  if [ -z ${PYLOAD_COMMIT+x} ]; then \
+    PYLOAD_COMMIT=$(curl -sX GET "https://api.github.com/repos/pyload/pyload/branches/develop" \
+      | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
-  pip3 install -U pip setuptools wheel && \
-  pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
-    "${PYLOAD}" && \
+  python3 -m venv /lsiopy && \
+  pip install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+    "git+https://github.com/pyload/pyload.git@${PYLOAD_COMMIT}" && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
@@ -59,6 +55,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8000
 VOLUME /config

Dockerfile.aarch64

@@ -1,9 +1,13 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG PYLOAD_VERSION
+ARG PYLOAD_COMMIT
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
@@ -15,6 +19,7 @@ RUN \
     build-base \
     cargo \
     curl-dev \
+    git \
     libffi-dev \
     libjpeg-turbo-dev \
     openssl-dev \
@@ -22,32 +27,23 @@ RUN \
     zlib-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    curl \
+    ffmpeg \
     libjpeg-turbo \
-    py3-pip \
+    7zip \
     python3 \
     sqlite \
     tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
   echo "**** install pyload ****" && \
-  if [ -z ${PYLOAD_VERSION+x} ]; then \
-    PYLOAD="pyload-ng[all]"; \
-  else \
-    PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
+  if [ -z ${PYLOAD_COMMIT+x} ]; then \
+    PYLOAD_COMMIT=$(curl -sX GET "https://api.github.com/repos/pyload/pyload/branches/develop" \
+      | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
-  pip3 install -U pip setuptools wheel && \
-  pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
-    "${PYLOAD}" && \
+  python3 -m venv /lsiopy && \
+  pip install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+    "git+https://github.com/pyload/pyload.git@${PYLOAD_COMMIT}" && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
@@ -59,6 +55,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8000
 VOLUME /config

Dockerfile.armhf

@@ -1,64 +0,0 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG PYLOAD_VERSION
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
-
-ENV HOME="/config"
-
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    cargo \
-    curl-dev \
-    libffi-dev \
-    libjpeg-turbo-dev \
-    openssl-dev \
-    python3-dev \
-    zlib-dev && \
-  echo "**** install packages ****" && \
-  apk add --no-cache \
-    curl \
-    libjpeg-turbo \
-    py3-pip \
-    python3 \
-    sqlite \
-    tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
-  echo "**** install pyload ****" && \
-  if [ -z ${PYLOAD_VERSION+x} ]; then \
-    PYLOAD="pyload-ng[all]"; \
-  else \
-    PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
-  fi && \
-  pip3 install -U pip setuptools wheel && \
-  pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
-    "${PYLOAD}" && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /tmp/* \
-    ${HOME}/.cache \
-    ${HOME}/.cargo
-
-# add local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 8000
-VOLUME /config

README.md

@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-pyload-ng/blob/main/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- Please read https://github.com/linuxserver/docker-pyload-ng/blob/develop/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -37,7 +36,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/pyload-ng)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/pyload-ng.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/pyload-ng)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/pyload-ng.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/pyload-ng)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-pyload-ng%2Fjob%2Fmain%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/main/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-pyload-ng%2Fjob%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-pyload-ng/job/develop/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fpyload-ng%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/pyload-ng/latest/index.html)
 
 [pyLoad](https://pyload.net/) is a Free and Open Source download manager written in Python and designed to be extremely lightweight, easily extensible and fully manageable via web.
@@ -46,26 +45,26 @@ Find us at:
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/pyload-ng` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/pyload-ng:develop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf | ❌ | |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
-| Tag | Description |
-| :----: | --- |
-| latest | Stable releases from pyLoad Next |
-| development | Releases from pyload Next development branch |
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable releases from pyLoad Next |
+| develop | ✅ | Releases from pyload Next develop branch |
 
 ## Application Setup
 
@@ -77,26 +76,26 @@ For general usage please see the pyLoad wiki [here](https://github.com/pyload/py
 
 ## Usage
 
-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
-version: "2.1"
 services:
   pyload-ng:
-    image: lscr.io/linuxserver/pyload-ng
+    image: lscr.io/linuxserver/pyload-ng:develop
     container_name: pyload-ng
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
     volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/pyload-ng/config:/config
       - /path/to/downloads:/downloads
     ports:
       - 8000:8000
+      - 9666:9666 #optional
     restart: unless-stopped
 ```
 
@@ -107,25 +106,27 @@ docker run -d \
   --name=pyload-ng \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Europe/London \
+  -e TZ=Etc/UTC \
   -p 8000:8000 \
-  -v /path/to/appdata/config:/config \
+  -p 9666:9666 `#optional` \
+  -v /path/to/pyload-ng/config:/config \
   -v /path/to/downloads:/downloads \
   --restart unless-stopped \
-  lscr.io/linuxserver/pyload-ng
+  lscr.io/linuxserver/pyload-ng:develop
 ```
 
 ## Parameters
 
-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
 | `-p 8000` | Allows HTTP access to the application |
+| `-p 9666` | Click'n'Load port. |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
-| `-v /config` | pyLoad Configuration and files database |
+| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
+| `-v /config` | Persistent config files |
 | `-v /downloads` | Destination of pyLoad downloads |
 
 ## Environment variables from files (Docker secrets)
@@ -135,10 +136,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:
 
 ```bash
--e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```
 
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
 
 ## Umask for running applications
 
@@ -147,15 +148,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
 
 ```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -166,53 +172,100 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Support Info
 
-* Shell access whilst the container is running: `docker exec -it pyload-ng /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f pyload-ng`
-* container version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' pyload-ng`
-* image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/pyload-ng`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it pyload-ng /bin/bash
+    ```
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f pyload-ng
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' pyload-ng
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/pyload-ng:develop
+    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
 
-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull pyload-ng`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d pyload-ng`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull pyload-ng
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d pyload-ng
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/pyload-ng`
-* Stop the running container: `docker stop pyload-ng`
-* Delete the container: `docker rm pyload-ng`
+* Update the image:
+
+    ```bash
+    docker pull lscr.io/linuxserver/pyload-ng:develop
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop pyload-ng
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm pyload-ng
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:
 
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once pyload-ng
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+    ```bash
+    docker image prune
+    ```
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -224,7 +277,7 @@ cd docker-pyload-ng
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/pyload-ng:latest .
+  -t lscr.io/linuxserver/pyload-ng:develop .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -237,4 +290,12 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.12.23:** - Rebase to Alpine 3.19.
+* **08.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
+* **10.08.23:** - Bump unrar to 6.2.10.
+* **01.06.23:** - Replace p7zip with 7zip, add unrar.
+* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
+* **02.02.22:** - Rebase develop to alpine 3.17.
+* **02.02.22:** - Add ffmpeg for the Youtube plugin.
+* **24.01.22:** - Replace unrar with p7zip.
 * **24.01.22:** - Initial release.

jenkins-vars.yml

@@ -2,19 +2,22 @@
 
 # jenkins variables
 project_name: docker-pyload-ng
-external_type: pip_version
-release_type: stable
-release_tag: latest
-ls_branch: main
+external_type: github_commit
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
+build_armhf: false
 repo_vars:
-  - EXT_PIP = 'pyload-ng'
-  - BUILD_VERSION_ARG = 'PYLOAD_VERSION'
+  - EXT_GIT_BRANCH = 'develop'
+  - EXT_USER = 'pyload'
+  - EXT_REPO = 'pyload'
+  - BUILD_VERSION_ARG = 'PYLOAD_COMMIT'
   - LS_USER = 'linuxserver'
-  - LS_REPO = 'docker-pyload'
-  - CONTAINER_NAME = 'pyload'
-  - DOCKERHUB_IMAGE = 'linuxserver/pyload'
-  - DEV_DOCKERHUB_IMAGE = 'lsiodev/pyload'
-  - PR_DOCKERHUB_IMAGE = 'lspipepr/pyload'
+  - LS_REPO = 'docker-pyload-ng'
+  - CONTAINER_NAME = 'pyload-ng'
+  - DOCKERHUB_IMAGE = 'linuxserver/pyload-ng'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/pyload-ng'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/pyload-ng'
   - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
   - CI='true'
@@ -25,3 +28,5 @@ repo_vars:
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''
+sponsor_links:
+  - { name: "pyLoad", url: "https://PayPal.Me/nitzo2001/0usd" }

package_versions.txt

@@ -0,0 +1,205 @@
+NAME                    VERSION                TYPE   
+7zip                    23.01-r0               apk     
+Babel                   2.14.0                 python  
+Brotli                  1.1.0                  python  
+Flask                   2.3.3                  python  
+Flask-Babel             1.0.0                  python  
+Flask-Caching           1.11.1                 python  
+Flask-Compress          1.14                   python  
+Flask-Themes2           1.0.1                  python  
+Jinja2                  3.1.3                  python  
+Js2Py                   0.74                   python  
+MarkupSafe              2.1.3                  python  
+Simple Launcher         1.1.0.14               dotnet  
+Werkzeug                3.0.1                  python  
+alpine-baselayout       3.4.3-r2               apk     
+alpine-baselayout-data  3.4.3-r2               apk     
+alpine-keys             2.4-r1                 apk     
+alpine-release          3.19.0-r0              apk     
+alsa-lib                1.2.10-r0              apk     
+aom-libs                3.7.1-r0               apk     
+apk-tools               2.14.0-r5              apk     
+bash                    5.2.21-r0              apk     
+bitmath                 1.3.3.1                python  
+blinker                 1.7.0                  python  
+brotli-libs             1.1.0-r1               apk     
+busybox                 1.36.1-r15             apk     
+busybox-binsh           1.36.1-r15             apk     
+c-ares                  1.24.0-r0              apk     
+ca-certificates         20230506-r0            apk     
+ca-certificates-bundle  20230506-r0            apk     
+cachelib                0.9.0                  python  
+cairo                   1.18.0-r0              apk     
+certifi                 2023.11.17             python  
+cffi                    1.16.0                 python  
+cheroot                 8.6.0                  python  
+cjson                   1.7.16-r1              apk     
+click                   8.1.7                  python  
+coreutils               9.4-r1                 apk     
+coreutils-env           9.4-r1                 apk     
+coreutils-fmt           9.4-r1                 apk     
+coreutils-sha512sum     9.4-r1                 apk     
+cryptography            41.0.7                 python  
+curl                    8.5.0-r0               apk     
+dbus-libs               1.14.10-r0             apk     
+ffmpeg                  6.1-r1                 apk     
+ffmpeg-libavcodec       6.1-r1                 apk     
+ffmpeg-libavdevice      6.1-r1                 apk     
+ffmpeg-libavfilter      6.1-r1                 apk     
+ffmpeg-libavformat      6.1-r1                 apk     
+ffmpeg-libavutil        6.1-r1                 apk     
+ffmpeg-libpostproc      6.1-r1                 apk     
+ffmpeg-libswresample    6.1-r1                 apk     
+ffmpeg-libswscale       6.1-r1                 apk     
+filetype                1.2.0                  python  
+flask-session2          1.3.1                  python  
+fontconfig              2.14.2-r4              apk     
+freetype                2.13.2-r0              apk     
+fribidi                 1.0.13-r0              apk     
+gdbm                    1.23-r1                apk     
+giflib                  5.2.1-r5               apk     
+glib                    2.78.3-r0              apk     
+glslang-libs            1.3.261.1-r0           apk     
+graphite2               1.3.14-r6              apk     
+harfbuzz                8.3.0-r0               apk     
+hwdata-pci              0.377.2-r0             apk     
+icu-data-en             74.1-r0                apk     
+icu-libs                74.1-r0                apk     
+itsdangerous            2.1.2                  python  
+jaraco.functools        4.0.0                  python  
+jq                      1.7.1-r0               apk     
+lame-libs               3.100-r5               apk     
+lcms2                   2.15-r4                apk     
+leptonica               1.83.1-r0              apk     
+libSvtAv1Enc            1.7.0-r0               apk     
+libacl                  2.3.1-r4               apk     
+libass                  0.17.1-r1              apk     
+libasyncns              0.8-r2                 apk     
+libattr                 2.5.1-r5               apk     
+libblkid                2.39.3-r0              apk     
+libbluray               1.3.4-r1               apk     
+libbsd                  0.11.7-r3              apk     
+libbz2                  1.0.8-r6               apk     
+libc-utils              0.7.2-r5               apk     
+libcrypto3              3.1.4-r3               apk     
+libcurl                 8.5.0-r0               apk     
+libdav1d                1.3.0-r0               apk     
+libdovi                 3.2.0-r1               apk     
+libdrm                  2.4.118-r0             apk     
+libexpat                2.5.0-r2               apk     
+libffi                  3.4.4-r3               apk     
+libflac                 1.4.3-r1               apk     
+libgcc                  13.2.1_git20231014-r0  apk     
+libgomp                 13.2.1_git20231014-r0  apk     
+libhwy                  1.0.7-r0               apk     
+libidn2                 2.3.4-r4               apk     
+libintl                 0.22.3-r0              apk     
+libjpeg-turbo           3.0.1-r0               apk     
+libjxl                  0.8.2-r0               apk     
+libltdl                 2.4.7-r3               apk     
+libmd                   1.1.0-r0               apk     
+libmount                2.39.3-r0              apk     
+libncursesw             6.4_p20231125-r0       apk     
+libogg                  1.3.5-r5               apk     
+libopenmpt              0.7.3-r1               apk     
+libpanelw               6.4_p20231125-r0       apk     
+libpciaccess            0.17-r2                apk     
+libplacebo              6.338.1-r0             apk     
+libpng                  1.6.40-r0              apk     
+libproc2                4.0.4-r0               apk     
+libpulse                16.1-r11               apk     
+librist                 0.2.10-r0              apk     
+libsharpyuv             1.3.2-r0               apk     
+libsndfile              1.2.2-r0               apk     
+libsodium               1.0.19-r0              apk     
+libsrt                  1.5.3-r0               apk     
+libssh                  0.10.6-r0              apk     
+libssl3                 3.1.4-r3               apk     
+libstdc++               13.2.1_git20231014-r0  apk     
+libtheora               1.1.1-r18              apk     
+libunibreak             5.1-r3                 apk     
+libunistring            1.1-r2                 apk     
+libva                   2.20.0-r0              apk     
+libvdpau                1.5-r2                 apk     
+libvorbis               1.3.7-r2               apk     
+libvpx                  1.13.1-r0              apk     
+libwebp                 1.3.2-r0               apk     
+libwebpmux              1.3.2-r0               apk     
+libx11                  1.8.7-r0               apk     
+libxau                  1.0.11-r3              apk     
+libxcb                  1.16-r0                apk     
+libxdmcp                1.1.4-r3               apk     
+libxext                 1.3.5-r3               apk     
+libxfixes               6.0.1-r3               apk     
+libxft                  2.3.8-r2               apk     
+libxml2                 2.11.6-r0              apk     
+libxrender              0.9.11-r4              apk     
+libzmq                  4.3.5-r2               apk     
+lilv-libs               0.24.22-r0             apk     
+linux-pam               1.5.3-r7               apk     
+mbedtls                 2.28.6-r0              apk     
+more-itertools          10.2.0                 python  
+mpdecimal               2.5.1-r2               apk     
+mpg123-libs             1.32.3-r0              apk     
+musl                    1.2.4_git20230717-r4   apk     
+musl-utils              1.2.4_git20230717-r4   apk     
+ncurses-terminfo-base   6.4_p20231125-r0       apk     
+netcat-openbsd          1.226-r0               apk     
+nghttp2-libs            1.58.0-r0              apk     
+numactl                 2.0.16-r4              apk     
+onevpl-libs             2023.3.1-r2            apk     
+oniguruma               6.9.9-r0               apk     
+opus                    1.4-r0                 apk     
+orc                     0.4.34-r0              apk     
+pango                   1.51.0-r0              apk     
+pcre2                   10.42-r2               apk     
+pip                     23.3.2                 python  
+pixman                  0.42.2-r2              apk     
+procps-ng               4.0.4-r0               apk     
+pyc                     3.11.6-r1              apk     
+pycparser               2.21                   python  
+pycurl                  7.45.2                 python  
+pyjsparser              2.7.1                  python  
+pyload-ng               0.5.0b3                python  
+python3                 3.11.6-r1              apk     
+python3-pyc             3.11.6-r1              apk     
+python3-pycache-pyc0    3.11.6-r1              apk     
+pytz                    2022.7.1               python  
+rav1e-libs              0.6.6-r2               apk     
+readline                8.2.1-r2               apk     
+scanelf                 1.3.7-r2               apk     
+sdl2                    2.28.5-r0              apk     
+semver                  2.13.0                 python  
+serd-libs               0.32.0-r0              apk     
+setuptools              65.5.0                 python  
+shaderc                 2023.7-r0              apk     
+shadow                  4.14.2-r0              apk     
+six                     1.16.0                 python  
+skalibs                 2.14.0.1-r0            apk     
+sord-libs               0.16.16-r0             apk     
+soxr                    0.1.3-r7               apk     
+speexdsp                1.2.1-r2               apk     
+spirv-tools             1.3.261.1-r0           apk     
+sqlite                  3.44.2-r0              apk     
+sqlite-libs             3.44.2-r0              apk     
+sratom                  0.6.16-r0              apk     
+ssl_client              1.36.1-r15             apk     
+tdb-libs                1.4.9-r0               apk     
+tesseract-ocr           5.3.3-r1               apk     
+tiff                    4.6.0-r0               apk     
+tzdata                  2023d-r0               apk     
+tzlocal                 5.2                    python  
+utmps-libs              0.1.2.2-r0             apk     
+v4l-utils-libs          1.24.1-r1              apk     
+vidstab                 1.1.1-r0               apk     
+vulkan-loader           1.3.261.1-r0           apk     
+wayland-libs-client     1.22.0-r4              apk     
+wheel                   0.42.0                 python  
+x264-libs               0.164_git20231001-r0   apk     
+x265-libs               3.5-r4                 apk     
+xvidcore                1.3.7-r2               apk     
+xz-libs                 5.4.5-r0               apk     
+zimg                    3.0.5-r2               apk     
+zix-libs                0.4.2-r0               apk     
+zlib                    1.3-r2                 apk     
+zstd-libs               1.5.5-r8               apk     

readme-vars.yml

@@ -11,20 +11,19 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable releases from pyLoad Next" }
-  - { tag: "development", desc: "Releases from pyload Next development branch" }
+  - { tag: "develop", desc: "Releases from pyload Next develop branch" }
 
 
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "pyLoad Configuration and files database" }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
   - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Destination of pyLoad downloads" }
 param_usage_include_ports: true
 param_ports:
@@ -34,9 +33,9 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 
 # optional params
-opt_param_usage_include_ports: false
+opt_param_usage_include_ports: true
 opt_param_ports:
-  - { external_port: "7227", internal_port: "7227", port_desc: "pyLoad control port" }
+  - { external_port: "9666", internal_port: "9666", port_desc: "Click'n'Load port." }
 
 
 # application setup block
@@ -50,4 +49,12 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
+  - { date: "08.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
+  - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "01.06.23:", desc: "Replace p7zip with 7zip, add unrar." }
+  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
+  - { date: "02.02.22:", desc: "Rebase develop to alpine 3.17." }
+  - { date: "02.02.22:", desc: "Add ffmpeg for the Youtube plugin." }
+  - { date: "24.01.22:", desc: "Replace unrar with p7zip." }
   - { date: "24.01.22:", desc: "Initial release." }

root/donate.txt

@@ -0,0 +1 @@
+pyLoad: https://PayPal.Me/nitzo2001/0usd

root/etc/cont-init.d/30-config

@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# create our folders
-mkdir -p \
-    /config/settings \
-    /downloads
-
-# default config file
-[[ ! -f "/config/settings/pyload.cfg" ]] && \
-    cp \
-        /defaults/pyload.cfg \
-        /config/settings/pyload.cfg
-
-# permissions
-echo "[cont-init.d] Setting permissions this may take some time"
-chown -R abc:abc \
-    /config
-chown abc:abc \
-    /downloads

root/etc/s6-overlay/s6-rc.d/init-pyload-config/run

@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# create our folders
+mkdir -p \
+    /config/settings \
+    /downloads
+
+# default config file
+cp -n \
+    /defaults/pyload.cfg \
+    /config/settings/pyload.cfg
+
+# permissions
+lsiown -R abc:abc \
+    /config
+lsiown abc:abc \
+    /downloads

root/etc/s6-overlay/s6-rc.d/init-pyload-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-pyload-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-pyload-config/run

root/etc/s6-overlay/s6-rc.d/svc-pyload/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-pyload/run

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+PORT=$(sed -n -e '/webui/,/proxy/p' /config/settings/pyload.cfg | grep "Port" | awk -F '=' '{print $2}' | tr -d ' ')
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT:-8000}" \
+    s6-setuidgid abc pyload --userdir /config --storagedir /downloads

root/etc/s6-overlay/s6-rc.d/svc-pyload/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/pyload/run

@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec \
-    s6-setuidgid abc pyload --userdir /config --storagedir /downloads