Revert "Patch according to bug #1986 Continuity counter error again https://tvheadend.org/issues/1986"

This reverts commit 4e9319e83a.

.drone.yml

@@ -0,0 +1,16 @@
+kind: pipeline
+name: default
+
+steps:
+- name: docker  
+  image: plugins/docker
+  settings:
+    registry: https://git.ivasoft.cz
+    username:
+      from_secret: repo_user
+    password:
+      from_secret: repo_pass
+    repo: git.ivasoft.cz/sw/docker-tvheadend
+    tags:
+      - latest
+      - ${DRONE_TAG:-latest}

.editorconfig

@@ -0,0 +1,20 @@
+# This file is globally distributed to all container image projects from
+# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+# trim_trailing_whitespace may cause unintended issues and should not be globally set true
+trim_trailing_whitespace = false
+
+[{Dockerfile*,**.yml}]
+indent_style = space
+indent_size = 2
+
+[{**.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

@@ -0,0 +1,123 @@
+# Contributing to tvheadend
+
+## Gotchas
+
+* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
+* Read, and fill the Pull Request template
+  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
+  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+
+## Common files
+
+| File | Use case |
+| :----: | --- |
+| `Dockerfile` | Dockerfile used to build amd64 images |
+| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
+| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
+| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
+| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
+| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
+| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
+| `readme-vars.yml` | This file is used to generate the `README.md` |
+
+## 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-tvheadend/edit/master/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-tvheadend)
+
+### Fixing typos or clarify the text in the readme
+
+There are variables for multiple parts of the readme, the most common ones are:
+
+| Variable | Description |
+| :----: | --- |
+| `project_blurb` | This is the short excerpt shown above the project logo. |
+| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
+
+### Parameters
+
+The compose and run examples are also generated from these variables.
+
+We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
+
+These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
+Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
+
+Devices, environment variables, ports and volumes expects its variables in a certain way.
+
+### Devices
+
+```yml
+param_devices:
+  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
+opt_param_devices:
+  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
+```
+
+### Environment variables
+
+```yml
+param_env_vars:
+  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
+opt_param_env_vars:
+  - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
+```
+
+### Ports
+
+```yml
+param_ports:
+  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
+opt_param_ports:
+  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
+```
+
+### Volumes
+
+```yml
+param_volumes:
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
+opt_param_volumes:
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
+```
+
+### Testing template changes
+
+After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
+
+## Dockerfiles
+
+We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
+If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
+
+### Testing your changes
+
+```bash
+git clone https://github.com/linuxserver/docker-tvheadend.git
+cd docker-tvheadend
+docker build \
+  --no-cache \
+  --pull \
+  -t linuxserver/tvheadend:latest .
+```
+
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+
+```bash
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+```
+
+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-tvheadend/tree/master/root), add an entry to the changelog
+
+```yml
+changelogs:
+  - { date: "DD.MM.YY:", desc: "Added some love to templates" }
+```

.github/ISSUE_TEMPLATE.md

@@ -1,34 +0,0 @@
-[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 issue 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:**      
-<!--- 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 tvheadend" -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,13 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discord chat support
+    url: https://discord.gg/YWrKVTn
+    about: Realtime support / chat with the community and the team.
+
+  - name: Discourse discussion forum
+    url: https://discourse.linuxserver.io
+    about: Post on our community forum.
+
+  - name: Documentation
+    url: https://docs.linuxserver.io/images/docker-tvheadend
+    about: Documentation - information about all of our containers.

.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.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

@@ -2,11 +2,11 @@
 
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-	
+
 
 <!--- Before submitting a pull request please check the following -->
 
-<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
+<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
 <!---  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/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@@ -21,7 +21,11 @@
 
 ------------------------------
 
-We welcome all PR’s though this doesn’t guarantee it will be accepted.
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+
+------------------------------
+
+<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
 
 ## Description:
 <!--- Describe your changes in detail -->

.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:  '27 13 * * *'
+  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

@@ -0,0 +1,104 @@
+name: External Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  external-trigger-master:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.1.0
+
+      - name: External Trigger
+        if: github.ref == 'refs/heads/master'
+        run: |
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_TVHEADEND_MASTER }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_TVHEADEND_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_TVHEADEND_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_TVHEADEND_MASTER\". ****"
+          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_TVHEADEND_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving external version ****"
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/tvheadend/tvheadend/commits/master" | 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 tvheadend branch master"
+            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-tvheadend/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"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            exit 1
+          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/tvheadend"
+          tag="latest"
+          token=$(curl -sX GET \
+            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Ftvheadend%3Apull" \
+            | jq -r '.token')
+            multidigest=$(curl -s \
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
+              | jq -r 'first(.manifests[].digest)')
+            digest=$(curl -s \
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+              | jq -r '.config.digest')
+          image_info=$(curl -sL \
+            --header "Authorization: Bearer ${token}" \
+            "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 tvheadend tag latest"
+            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-tvheadend/job/master/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-tvheadend/job/master/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 ****"
+            sleep 10
+            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" \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+              --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 tvheadend tag latest. 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 }}
+          fi

.github/workflows/external_trigger_scheduler.yml

@@ -0,0 +1,45 @@
+name: External Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '39 * * * *'
+  workflow_dispatch:
+
+jobs:
+  external-trigger-scheduler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.1.0
+        with:
+          fetch-depth: '0'
+
+      - name: External Trigger Scheduler
+        run: |
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          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_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-tvheadend/${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-tvheadend/${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" \
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                  https://api.github.com/repos/linuxserver/docker-tvheadend/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} 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

@@ -1,6 +1,6 @@
 name: Greetings
 
-on: [pull_request, issues]
+on: [pull_request_target, issues]
 
 jobs:
   greeting:
@@ -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 [issue template](https://github.com/linuxserver/docker-tvheadend/.github/ISSUE_TEMPLATE.md)!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-tvheadend/.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-tvheadend/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -0,0 +1,42 @@
+name: Package Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package-trigger-master:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.1.0
+
+      - name: Package Trigger
+        if: github.ref == 'refs/heads/master'
+        run: |
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/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 master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER\". ****"
+          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          response=$(curl -iX POST \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/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 ****"
+          sleep 10
+          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" \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+            --data-urlencode "Submit=Submit"

.github/workflows/package_trigger_scheduler.yml

@@ -0,0 +1,50 @@
+name: Package Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '25 15 * * 6'
+  workflow_dispatch:
+
+jobs:
+  package-trigger-scheduler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.1.0
+        with:
+          fetch-depth: '0'
+
+      - name: Package Trigger Scheduler
+        run: |
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          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-tvheadend/${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-tvheadend/${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 }}" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                  https://api.github.com/repos/linuxserver/docker-tvheadend/actions/workflows/package_trigger.yml/dispatches
+                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} ****"
+          echo "**** Notifying Discord ****"
+          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+            "description": "**Package Check Build(s) Triggered for tvheadend** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-tvheadend/activity/"' \n"}],
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.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@v1
-      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 }}

.gitignore

@@ -44,3 +44,4 @@ Temporary Items
 
 # Picons file
 picons.tar.bz2
+.jenkins-external

Dockerfile

@@ -1,227 +1,155 @@
-FROM lsiobase/alpine:3.12 as buildstage
+# syntax=docker/dockerfile:1
+
+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage
 ############## build stage ##############
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
 
 # environment settings
-ARG TZ="Europe/Oslo"
+ARG TZ="Etc/UTC"
 ARG TVHEADEND_COMMIT
 ENV HOME="/config"
 
-# copy patches
+# copy patches and picons
 COPY patches/ /tmp/patches/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libva-dev \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-dev \
-	opus-dev \
-	patch \
-	pcre2-dev \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-dev \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	pkgconf \
-	pngquant \
-	python2 \
-	sdl-dev \
-	tar \
-	uriparser-dev \
-	wget \
-	x264-dev \
-	x265-dev \
-	zlib-dev
+  echo "**** install build packages ****" && \
+  apk add --no-cache \
+    autoconf \
+    automake \
+    bsd-compat-headers \
+    build-base \
+    cmake \
+    ffmpeg4-dev \
+    file \
+    findutils \
+    gettext-dev \
+    git \
+    gnu-libiconv-dev \
+    libdvbcsa-dev \
+    libgcrypt-dev \
+    libhdhomerun-dev \
+    libtool \
+    libva-dev \
+    libvpx-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    openssl-dev \
+    opus-dev \
+    patch \
+    pcre2-dev \
+    pkgconf \
+    pngquant \
+    python3 \
+    sdl2-dev \
+    uriparser-dev \
+    x264-dev \
+    x265-dev \
+    zlib-dev
 
 RUN \
- echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
- rm -rf /usr/include/iconv.h && \
- cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
+  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
+  rm -rf /usr/include/iconv.h && \
+  cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
 
 RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
+  echo "**** compile tvheadend ****" && \
+  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+    TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+    | jq -r '. | .sha'); \
+  fi && \
+  mkdir -p \
+    /tmp/tvheadend && \
+  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+  cd /tmp/tvheadend && \
+  git checkout ${TVHEADEND_COMMIT} && \
+  ./configure \
+    `#Encoding` \
+    --disable-ffmpeg_static \
+    --disable-libfdkaac_static \
+    --disable-libtheora_static \
+    --disable-libopus_static \
+    --disable-libvorbis_static \
+    --disable-libvpx_static \
+    --disable-libx264_static \
+    --disable-libx265_static \
+    --disable-libfdkaac \
+    --enable-libopus \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --enable-libx265 \
+    \
+    `#Options` \
+    --disable-avahi \
+    --disable-dbus_1 \
+    --disable-bintray_cache \
+    --disable-execinfo \
+    --disable-hdhomerun_static \
+    --enable-hdhomerun_client \
+    --enable-libav \
+    --enable-pngquant \
+    --enable-trace \
+    --enable-vaapi \
+    --infodir=/usr/share/info \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --prefix=/usr \
+    --python=python3 \
+    --sysconfdir=/config && \
+  make -j 2 && \
+  make DESTDIR=/tmp/tvheadend-build install
 
 RUN \
- echo "**** compile XMLTV ****" && \
- git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
- cd /tmp/xmltv && \
- git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
- echo "**** Perl 5.26 fixes for XMTLV ****" && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
- sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
- sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
- sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
- sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
- PERL5LIB=`pwd` && \
- echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
- make -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
+  echo "**** compile argtable2 ****" && \
+  ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
+  mkdir -p \
+    /tmp/argtable && \
+  curl -s -o \
+  /tmp/argtable-src.tar.gz -L \
+    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+  tar xf \
+  /tmp/argtable-src.tar.gz -C \
+    /tmp/argtable --strip-components=1 && \
+  cp /tmp/patches/config.* /tmp/argtable && \
+  cd /tmp/argtable && \
+  ./configure \
+    --prefix=/usr && \
+  make -j 2 && \
+  make check && \
+  make DESTDIR=/tmp/argtable-build install && \
+  echo "**** copy to /usr for comskip dependency ****" && \
+  cp -pr /tmp/argtable-build/usr/* /usr/
 
 RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-	| jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-	/tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./configure \
-	`#Encoding` \
-	--disable-ffmpeg_static \
-	--disable-libfdkaac_static \
-	--disable-libtheora_static \
-	--disable-libopus_static \
-	--disable-libvorbis_static \
-	--disable-libvpx_static \
-	--disable-libx264_static \
-	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--enable-pngquant \
-	--enable-trace \
-	--enable-vaapi \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make -j 2 && \
- make DESTDIR=/tmp/tvheadend-build install
+  echo "***** compile comskip ****" && \
+  git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
+  cd /tmp/comskip && \
+  ./autogen.sh && \
+  ./configure \
+    --bindir=/usr/bin \
+    --sysconfdir=/config/comskip && \
+  make -j 2 && \
+  make DESTDIR=/tmp/comskip-build install
 
 RUN \
- echo "**** compile argtable2 ****" && \
- ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
- mkdir -p \
-	/tmp/argtable && \
- curl -o \
- /tmp/argtable-src.tar.gz -L \
-	"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
- tar xf \
- /tmp/argtable-src.tar.gz -C \
-	/tmp/argtable --strip-components=1 && \
- cp /tmp/patches/config.* /tmp/argtable && \
- cd /tmp/argtable && \
- ./configure \
-	--prefix=/usr && \
- make -j 2 && \
- make check && \
- make DESTDIR=/tmp/argtable-build install && \
- echo "**** copy to /usr for comskip dependency ****" && \
- cp -pr /tmp/argtable-build/usr/* /usr/
-
-RUN \
- echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
- cd /tmp/comskip && \
- ./autogen.sh && \
- ./configure \
-	--bindir=/usr/bin \
-	--sysconfdir=/config/comskip && \
- make -j 2 && \
- make DESTDIR=/tmp/comskip-build install
+  echo "***** extract picons ****" && \
+  mkdir -p /picons && \
+  tar xf \
+    /picons.tar.bz2 -C \
+    /picons
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:3.12
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -233,105 +161,48 @@ LABEL maintainer="saarg"
 ENV HOME="/config"
 
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
-	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
-	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libva \
-	libva-intel-driver \
-	mesa-dri-ati \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	py3-requests \
-	python2 \
-	tar \
-	uriparser \
-	wget \
-	x264 \
-	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    bsd-compat-headers \
+    ffmpeg \
+    ffmpeg4-libavcodec \
+    ffmpeg4-libavdevice \
+    ffmpeg4-libavfilter \
+    ffmpeg4-libavformat \
+    ffmpeg4-libavutil \
+    ffmpeg4-libpostproc \
+    ffmpeg4-libswresample \
+    ffmpeg4-libswscale \
+    gnu-libiconv \
+    libdvbcsa \
+    libhdhomerun-libs \
+    libva \
+    libva-intel-driver \
+    intel-media-driver \
+    mesa \
+    libvpx \
+    libxml2 \
+    libxslt \
+    linux-headers \
+    opus \
+    pcre2 \
+    perl \
+    perl-datetime-format-strptime \
+    perl-json \
+    perl-json-xs \
+    py3-requests \
+    python3 \
+    uriparser \
+    x264 \
+    x265 \
+    xmltv \
+    zlib
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
-COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=buildstage /picons /picons
 COPY root/ /
 
 # ports and volumes

Dockerfile.aarch64

@@ -1,225 +1,156 @@
-FROM lsiobase/alpine:arm64v8-3.12 as buildstage
+# syntax=docker/dockerfile:1
+
+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as buildstage
 ############## build stage ##############
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
 
 # environment settings
-ARG TZ="Europe/Oslo"
+ARG TZ="Etc/UTC"
 ARG TVHEADEND_COMMIT
 ENV HOME="/config"
 
-# copy patches
+# copy patches and picons
 COPY patches/ /tmp/patches/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-dev \
-	opus-dev \
-	patch \
-	pcre2-dev \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-dev \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	pkgconf \
-	pngquant \
-	python2 \
-	sdl-dev \
-	tar \
-	uriparser-dev \
-	wget \
-	x264-dev \
-	x265-dev \
-	zlib-dev	
+  echo "**** install build packages ****" && \
+  apk add --no-cache \
+    autoconf \
+    automake \
+    bsd-compat-headers \
+    build-base \
+    cmake \
+    ffmpeg4-dev \
+    file \
+    findutils \
+    gettext-dev \
+    git \
+    gnu-libiconv-dev \
+    libdvbcsa-dev \
+    libgcrypt-dev \
+    libhdhomerun-dev \
+    libtool \
+    libva-dev \
+    libvpx-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    openssl-dev \
+    opus-dev \
+    patch \
+    pcre2-dev \
+    pkgconf \
+    pngquant \
+    python3 \
+    sdl2-dev \
+    uriparser-dev \
+    x264-dev \
+    x265-dev \
+    zlib-dev
 
 RUN \
- echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
- rm -rf /usr/include/iconv.h && \
- cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
+  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
+  rm -rf /usr/include/iconv.h && \
+  cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
 
 RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
+  echo "**** compile tvheadend ****" && \
+  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+    TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+    | jq -r '. | .sha'); \
+  fi && \
+  mkdir -p \
+    /tmp/tvheadend && \
+  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+  cd /tmp/tvheadend && \
+  git checkout ${TVHEADEND_COMMIT} && \
+  ./configure \
+    `#Encoding` \
+    --disable-ffmpeg_static \
+    --disable-libfdkaac_static \
+    --disable-libtheora_static \
+    --disable-libopus_static \
+    --disable-libvorbis_static \
+    --disable-libvpx_static \
+    --disable-libx264_static \
+    --disable-libx265_static \
+    --disable-libfdkaac \
+    --enable-libopus \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --enable-libx265 \
+    \
+    `#Options` \
+    --disable-avahi \
+    --disable-dbus_1 \
+    --disable-bintray_cache \
+    --disable-execinfo \
+    --disable-hdhomerun_static \
+    --enable-hdhomerun_client \
+    --enable-libav \
+    --enable-pngquant \
+    --enable-trace \
+    --enable-vaapi \
+    --infodir=/usr/share/info \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --prefix=/usr \
+    --python=python3 \
+    --sysconfdir=/config && \
+  make -j 2 && \
+  make DESTDIR=/tmp/tvheadend-build install
 
 RUN \
- echo "**** compile XMLTV ****" && \
- git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
- cd /tmp/xmltv && \
- git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
- echo "**** Perl 5.26 fixes for XMTLV ****" && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
- sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
- sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
- sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
- sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
- PERL5LIB=`pwd` && \
- echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
- make -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
+  echo "**** compile argtable2 ****" && \
+  ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
+  mkdir -p \
+    /tmp/argtable && \
+  curl -s -o \
+  /tmp/argtable-src.tar.gz -L \
+    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+  tar xf \
+  /tmp/argtable-src.tar.gz -C \
+    /tmp/argtable --strip-components=1 && \
+  cp /tmp/patches/config.* /tmp/argtable && \
+  cd /tmp/argtable && \
+  ./configure \
+    --prefix=/usr && \
+  make -j 2 && \
+  make check && \
+  make DESTDIR=/tmp/argtable-build install && \
+  echo "**** copy to /usr for comskip dependency ****" && \
+  cp -pr /tmp/argtable-build/usr/* /usr/
 
 RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-        /tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./configure \
-	`#Encoding` \
-	--disable-ffmpeg_static \
-	--disable-libfdkaac_static \
-	--disable-libtheora_static \
-	--disable-libopus_static \
-	--disable-libvorbis_static \
-	--disable-libvpx_static \
-	--disable-libx264_static \
-	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--enable-pngquant \
-	--enable-trace \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make -j 2 && \
- make DESTDIR=/tmp/tvheadend-build install
+  echo "***** compile comskip ****" && \
+  git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
+  cd /tmp/comskip && \
+  ./autogen.sh && \
+  ./configure \
+    --bindir=/usr/bin \
+    --sysconfdir=/config/comskip && \
+  make -j 2 && \
+  make DESTDIR=/tmp/comskip-build install
 
 RUN \
- echo "**** compile argtable2 ****" && \
- ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
- mkdir -p \
-	/tmp/argtable && \
- curl -o \
- /tmp/argtable-src.tar.gz -L \
-	"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
- tar xf \
- /tmp/argtable-src.tar.gz -C \
-	/tmp/argtable --strip-components=1 && \
- cp /tmp/patches/config.* /tmp/argtable && \
- cd /tmp/argtable && \
- ./configure \
-	--prefix=/usr && \
- make -j 2 && \
- make check && \
- make DESTDIR=/tmp/argtable-build install && \
- echo "**** copy to /usr for comskip dependency ****" && \
- cp -pr /tmp/argtable-build/usr/* /usr/
+  echo "***** extract picons ****" && \
+  mkdir -p /picons && \
+  tar xf \
+    /picons.tar.bz2 -C \
+    /picons
 
-RUN \
- echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
- cd /tmp/comskip && \
- ./autogen.sh && \
- ./configure \
-	--bindir=/usr/bin \
-	--sysconfdir=/config/comskip && \
- make -j 2 && \
- make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:arm64v8-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -231,102 +162,46 @@ LABEL maintainer="saarg"
 ENV HOME="/config"
 
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
-	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
-	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	py3-requests \
-	python2 \
-	tar \
-	uriparser \
-	wget \
-	x264 \
-	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    bsd-compat-headers \
+    ffmpeg \
+    ffmpeg4-libavcodec \
+    ffmpeg4-libavdevice \
+    ffmpeg4-libavfilter \
+    ffmpeg4-libavformat \
+    ffmpeg4-libavutil \
+    ffmpeg4-libpostproc \
+    ffmpeg4-libswresample \
+    ffmpeg4-libswscale \
+    gnu-libiconv \
+    libdvbcsa \
+    libhdhomerun-libs \
+    libva \
+    mesa \
+    libvpx \
+    libxml2 \
+    libxslt \
+    linux-headers \
+    opus \
+    pcre2 \
+    perl \
+    perl-datetime-format-strptime \
+    perl-json \
+    perl-json-xs \
+    py3-requests \
+    python3 \
+    uriparser \
+    x264 \
+    x265 \
+    xmltv \
+    zlib
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
-COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=buildstage /picons /picons
 COPY root/ /
 
 # ports and volumes

Dockerfile.armhf

@@ -1,334 +0,0 @@
-FROM lsiobase/alpine:arm32v7-3.12 as buildstage
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
-
-# environment settings
-ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-dev \
-	opus-dev \
-	patch \
-	pcre2-dev \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-dev \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	pkgconf \
-	pngquant \
-	python2 \
-	sdl-dev \
-	tar \
-	uriparser-dev \
-	wget \
-	x264-dev \
-	x265-dev \
-	zlib-dev
-
-RUN \
- echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
- rm -rf /usr/include/iconv.h && \
- cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
-
-RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
-
-RUN \
- echo "**** compile XMLTV ****" && \
- git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
- cd /tmp/xmltv && \
- git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
- echo "**** Perl 5.26 fixes for XMTLV ****" && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
- sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
- sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
- sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
- sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
- sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
- PERL5LIB=`pwd` && \
- echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
- make -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
-
-RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-        /tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./configure \
-	`#Encoding` \
-	--disable-ffmpeg_static \
-	--disable-libfdkaac_static \
-	--disable-libtheora_static \
-	--disable-libopus_static \
-	--disable-libvorbis_static \
-	--disable-libvpx_static \
-	--disable-libx264_static \
-	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--enable-pngquant \
-	--enable-trace \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make -j 2 && \
- make DESTDIR=/tmp/tvheadend-build install
-
-RUN \
- echo "**** compile argtable2 ****" && \
- ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
- mkdir -p \
-	/tmp/argtable && \
- curl -o \
- /tmp/argtable-src.tar.gz -L \
-	"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
- tar xf \
- /tmp/argtable-src.tar.gz -C \
-	/tmp/argtable --strip-components=1 && \
- cp /tmp/patches/config.* /tmp/argtable && \
- cd /tmp/argtable && \
- ./configure \
-	--prefix=/usr && \
- make -j 2 && \
- make check && \
- make DESTDIR=/tmp/argtable-build install && \
- echo "**** copy to /usr for comskip dependency ****" && \
- cp -pr /tmp/argtable-build/usr/* /usr/
-
-RUN \
- echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
- cd /tmp/comskip && \
- ./autogen.sh && \
- ./configure \
-	--bindir=/usr/bin \
-	--sysconfdir=/config/comskip && \
- make -j 2 && \
- make DESTDIR=/tmp/comskip-build install
-
-############## runtime stage ##############
-FROM lsiobase/alpine:arm32v7-3.12
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="saarg"
-
-# environment settings
-ENV HOME="/config"
-
-RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
-	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
-	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	perl-data-dumper \
-	perl-date-manip \
-	perl-datetime \
-	perl-datetime-format-strptime \
-	perl-datetime-timezone \
-	perl-dbd-sqlite \
-	perl-dbi \
-	perl-digest-sha1 \
-	perl-doc \
-	perl-file-slurp \
-	perl-file-temp \
-	perl-file-which \
-	perl-getopt-long \
-	perl-html-parser \
-	perl-html-tree \
-	perl-http-cookies \
-	perl-io \
-	perl-io-compress \
-	perl-io-html \
-	perl-io-socket-ssl \
-	perl-io-stringy \
-	perl-json \
-	perl-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	perl-module-build \
-	perl-module-pluggable \
-	perl-net-ssleay \
-	perl-parse-recdescent \
-	perl-path-class \
-	perl-scalar-list-utils \
-	perl-term-progressbar \
-	perl-term-readkey \
-	perl-test-exception \
-	perl-test-requires \
-	perl-timedate \
-	perl-try-tiny \
-	perl-unicode-string \
-	perl-xml-libxml \
-	perl-xml-libxslt \
-	perl-xml-parser \
-	perl-xml-sax \
-	perl-xml-treepp \
-	perl-xml-twig \
-	perl-xml-writer \
-	py3-requests \
-	python2 \
-	tar \
-	uriparser \
-	wget \
-	x264 \
-	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
-
-# copy local files and buildstage artifacts
-COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
-COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
-COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
-COPY root/ /
-
-# ports and volumes
-EXPOSE 9981 9982
-VOLUME /config

Jenkinsfile

@@ -16,6 +16,7 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
+    SCARF_TOKEN=credentials('scarf_api_key')
     EXT_GIT_BRANCH = 'master'
     EXT_USER = 'tvheadend'
     EXT_REPO = 'tvheadend'
@@ -41,10 +42,16 @@ pipeline {
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
+        sh '''#! /bin/bash
+              containers=$(docker ps -aq)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -58,7 +65,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -106,7 +113,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-           script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
+           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
            returnStdout: true).trim()
        }
      }
@@ -126,6 +133,30 @@ pipeline {
           env.EXT_RELEASE_CLEAN = sh(
             script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
             returnStdout: true).trim()
+
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
+          if (semver.find()) {
+            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
+          } else {
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
+            if (semver.find()) {
+              if (semver[0][3]) {
+                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
+              } else if (!semver[0][3] && !semver[0][4]) {
+                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}"
+              }
+            }
+          }
+
+          if (env.SEMVER != null) {
+            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
+            }
+            println("SEMVER: ${env.SEMVER}")
+          } else {
+            println("No SEMVER detected")
+          }
+
         }
       }
     }
@@ -138,14 +169,17 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
@@ -158,14 +192,17 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
         }
       }
@@ -178,14 +215,17 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
         }
@@ -198,25 +238,22 @@ pipeline {
       }
       steps {
         withCredentials([
-          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
         ]) {
           script{
-            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                set -e
-                docker pull lsiodev/spaces-file-upload:latest
                 docker run --rm \
-                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
-                -e FILE_NAME="shellcheck-result.xml" \
-                -e MIMETYPE="text/xml" \
-                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${DO_KEY}\" \
-                -t lsiodev/spaces-file-upload:latest \
-                python /upload.py'''
+                  -v ${WORKSPACE}:/mnt \
+                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
+                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
+                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache py3-pip && \
+                    pip install s3cmd && \
+                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
     }
@@ -233,21 +270,69 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Stage 1 - Jenkinsfile update
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f master
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                git add Jenkinsfile
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating Jenkinsfile"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "Jenkinsfile is up to date."
+              fi
+              # Stage 2 - Delete old templates
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              for i in ${OLD_TEMPLATES}; do
+                if [[ -f "${i}" ]]; then
+                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                fi
+              done
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f master
+                for i in ${TEMPLATES_TO_DELETE}; do
+                  git rm "${i}"
+                done
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Deleting old and deprecated templates"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "No templates to delete"
+              fi
+              # Stage 3 - Update templates
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
                 git checkout -f master
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                git add ${TEMPLATED_FILES}
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                  echo ".jenkins-external" >> .gitignore
+                  git add .gitignore
+                fi
+                git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -256,13 +341,36 @@ pipeline {
               fi
               mkdir -p ${TEMPDIR}/gitbook
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                 cd ${TEMPDIR}/gitbook/docker-documentation/
                 git add images/docker-${CONTAINER_NAME}.md
                 git commit -m 'Bot Updating Documentation'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
               fi
+              mkdir -p ${TEMPDIR}/unraid
+              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              fi
+              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                cd ${TEMPDIR}/unraid/templates/
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
+                else
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add unraid/${CONTAINER_NAME}.xml
+                  git commit -m 'Bot Updating Unraid Template'
+                fi
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+              fi
               rm -Rf ${TEMPDIR}'''
         script{
           env.FILES_UPDATED = sh(
@@ -287,6 +395,26 @@ pipeline {
         }
       }
     }
+    // If this is a master build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
     /* #######################
            GitLab Mirroring
        ####################### */
@@ -307,60 +435,95 @@ pipeline {
              "visibility":"public"}' '''
       } 
     }
+    /* #######################
+           Scarf.sh package registry
+       ####################### */
+    // Add package to Scarf.sh and set permissions
+    stage("Scarf.sh package registry"){
+      when {
+        branch "master"
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps{
+        sh '''#! /bin/bash
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/tvheadend") | .uuid' || :)
+              if [ -z "${PACKAGE_UUID}" ]; then
+                echo "Adding package to Scarf.sh"
+                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
+                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -d '{"name":"linuxserver/tvheadend",\
+                       "shortDescription":"example description",\
+                       "libraryType":"docker",\
+                       "website":"https://github.com/linuxserver/docker-tvheadend",\
+                       "backendUrl":"https://ghcr.io/linuxserver/tvheadend",\
+                       "publicUrl":"https://lscr.io/linuxserver/tvheadend"}' || :
+              else
+                echo "Package already exists on Scarf.sh"
+              fi
+           '''
+      } 
+    }
     /* ###############
        Build Container
        ############### */
     // Build Docker container for push to LS Repo
     stage('Build-Single') {
       when {
-        environment name: 'MULTIARCH', value: 'false'
+        expression {
+          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
+        }
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
-        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        echo "Running on node: ${NODE_NAME}"
+        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+        sh "docker buildx build \
+          --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+          --label \"org.opencontainers.image.authors=linuxserver.io\" \
+          --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-tvheadend/packages\" \
+          --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-tvheadend\" \
+          --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-tvheadend\" \
+          --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+          --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+          --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+          --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+          --label \"org.opencontainers.image.title=Tvheadend\" \
+          --label \"org.opencontainers.image.description=[Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.  Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.  Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).  \" \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
     // Build MultiArch Docker containers for push to LS Repo
     stage('Build-Multi') {
       when {
-        environment name: 'MULTIARCH', value: 'true'
+        allOf {
+          environment name: 'MULTIARCH', value: 'true'
+          expression { params.PACKAGE_CHECK == 'false' }
+        }
         environment name: 'EXIT_STATUS', value: ''
       }
       parallel {
         stage('Build X86') {
           steps {
-            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
-            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-          }
-        }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          steps {
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-                usernameVariable: 'DOCKERUSER',
-                passwordVariable: 'DOCKERPASS'
-              ]
-            ]) {
-              echo 'Logging into DockerHub'
-              sh '''#! /bin/bash
-                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                 '''
-              sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
-                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              retry(5) {
-                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              }
-              sh '''docker rmi \
-                    ${IMAGE}:arm32v7-${META_TAG} \
-                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-            }
+            echo "Running on node: ${NODE_NAME}"
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+            sh "docker buildx build \
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+              --label \"org.opencontainers.image.authors=linuxserver.io\" \
+              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-tvheadend/packages\" \
+              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-tvheadend\" \
+              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-tvheadend\" \
+              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.title=Tvheadend\" \
+              --label \"org.opencontainers.image.description=[Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.  Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.  Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).  \" \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
         stage('Build ARM64') {
@@ -368,28 +531,37 @@ pipeline {
             label 'ARM64'
           }
           steps {
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-                usernameVariable: 'DOCKERUSER',
-                passwordVariable: 'DOCKERPASS'
-              ]
-            ]) {
-              echo 'Logging into DockerHub'
-              sh '''#! /bin/bash
-                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                 '''
-              sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
-                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              retry(5) {
-                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              }
-              sh '''docker rmi \
-                    ${IMAGE}:arm64v8-${META_TAG} \
-                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            echo "Running on node: ${NODE_NAME}"
+            echo 'Logging into Github'
+            sh '''#! /bin/bash
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+               '''
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+            sh "docker buildx build \
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+              --label \"org.opencontainers.image.authors=linuxserver.io\" \
+              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-tvheadend/packages\" \
+              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-tvheadend\" \
+              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-tvheadend\" \
+              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.title=Tvheadend\" \
+              --label \"org.opencontainers.image.description=[Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.  Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.  Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).  \" \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            retry(5) {
+              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
+            sh '''#! /bin/bash
+                  containers=$(docker ps -aq)
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -405,22 +577,17 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
               fi
-              if [ "${DIST_IMAGE}" == "alpine" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apk info -v > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              fi
+              touch ${TEMPDIR}/package_versions.txt
+              docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                -v ${TEMPDIR}:/tmp \
+                ghcr.io/anchore/syft:latest \
+                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
@@ -488,20 +655,19 @@ pipeline {
       }
       steps {
         withCredentials([
-          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'ci-tests-s3-secret-access-key	', variable: 'S3_SECRET')
         ]) {
           script{
-            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
           }
           sh '''#! /bin/bash
                 set -e
-                docker pull lsiodev/ci:latest
+                docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
                 --shm-size=1gb \
@@ -513,16 +679,14 @@ pipeline {
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
-                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e ACCESS_KEY=\"${S3_KEY}\" \
                 -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
-                -e DO_BUCKET="lsio-ci" \
-                -t lsiodev/ci:latest \
-                python /ci/ci.py'''
+                -t ghcr.io/linuxserver/ci:latest \
+                python3 test_build.py'''
         }
       }
     }
@@ -542,29 +706,37 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
+          ],
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
           ]
         ]) {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                     docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
                     docker push ${PUSHIMAGE}:latest
                     docker push ${PUSHIMAGE}:${META_TAG}
+                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                     docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                done
-             '''
         }
       }
     }
@@ -581,74 +753,79 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
+          ],
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
           ]
         ]) {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
-                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                     docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
                     docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    fi
+                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
+                    digest=$(curl -s \
+                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+                      --header "Authorization: Bearer ${token}" \
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
+                    fi
                     docker manifest push --purge ${MANIFESTIMAGE}:latest
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    fi
                   done
-                  docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
-                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
-                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
-                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
-                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
-                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
-                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
-                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
-                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
-                  docker push ${GITHUBIMAGE}:latest
-                  docker push ${GITHUBIMAGE}:${META_TAG}
-                  docker push ${GITHUBIMAGE}:arm32v7-latest
-                  docker push ${GITHUBIMAGE}:arm64v8-latest
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest || :
-                done
-                docker rmi \
-                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
         }
       }
     }
@@ -663,20 +840,20 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
+        echo "Pushing New tag for current commit ${META_TAG}"
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+        -d '{"tag":"'${META_TAG}'",\
              "object": "'${COMMIT_SHA}'",\
              "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
-              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_RELEASE_CLEAN} | jq '.commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "master",\
-                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "name": "'${META_TAG}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": false}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -700,9 +877,9 @@ pipeline {
           sh '''#! /bin/bash
                 set -e
                 TEMPDIR=$(mktemp -d)
-                docker pull linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
-                docker pull lsiodev/readme-sync
+                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
+                docker pull ghcr.io/linuxserver/readme-sync
                 docker run --rm=true \
                   -e DOCKERHUB_USERNAME=$DOCKERUSER \
                   -e DOCKERHUB_PASSWORD=$DOCKERPASS \
@@ -710,7 +887,7 @@ pipeline {
                   -e DOCKER_REPOSITORY=${IMAGE} \
                   -e GIT_BRANCH=master \
                   -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  lsiodev/readme-sync bash -c 'node sync' 
+                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
                 rm -Rf ${TEMPDIR} '''
         }
       }
@@ -719,12 +896,78 @@ pipeline {
     stage('Pull Request Comment') {
       when {
         not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
       }
     }
   }
@@ -738,18 +981,26 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
     cleanup {
+      sh '''#! /bin/bash
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
       cleanWs()
     }
   }

README.md

@@ -1,3 +1,6 @@
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- Please read the https://github.com/linuxserver/docker-tvheadend/blob/master/.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!")
@@ -9,13 +12,14 @@
 
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
- * regular and timely application updates
- * easy user mappings (PGID, PUID)
- * custom base image with s6 overlay
- * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
- * regular security updates
+* regular and timely application updates
+* easy user mappings (PGID, PUID)
+* custom base image with s6 overlay
+* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+* regular security updates
 
 Find us at:
+
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
@@ -25,154 +29,37 @@ Find us at:
 
 # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
 
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Ftvheadend?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Ftvheadend)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-tvheadend)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-tvheadend/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-tvheadend/packages)
-[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-tvheadend/container_registry)
-[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-tvheadend/container_registry)
+[![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/tvheadend)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
 [![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-tvheadend%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
-[![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%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Ftvheadend%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)
+[![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%2Ftvheadend%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/tvheadend/latest/index.html)
 
 [Tvheadend](https://www.tvheadend.org/) works as a proxy server: is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
 Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
 Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
 
-
 [![tvheadend](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/tvheadend-big.png)](https://www.tvheadend.org/)
 
 ## 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://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/).
 
-Simply pulling `linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/tvheadend:latest` 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.
-
-| Tag | Description |
-| :----: | --- |
-| latest | Current latest release. |
-| release-4.2 | Latest release from 4.2 branch. |
-| stable-4.2.1 | Old stable version. Will not be updated anymore! |
-| stable-4.0.9 | Old stable version. Will not be updated anymore! |
-
-## Usage
-
-Here are some example snippets to help you get started creating a container.
-
-### docker
-
-```
-docker create \
-  --name=tvheadend \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Europe/London \
-  -e RUN_OPTS=<run options here> `#optional` \
-  -p 9981:9981 \
-  -p 9982:9982 \
-  -v <path to data>:/config \
-  -v <path to recordings>:/recordings \
-  --device /dev/dri:/dev/dri `#optional` \
-  --device /dev/dvb:/dev/dvb `#optional` \
-  --restart unless-stopped \
-  linuxserver/tvheadend
-```
-
-#### Host vs. Bridge
-
-If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
-
-
-### docker-compose
-
-Compatible with docker-compose v2 schemas.
-
-```
----
-version: "2.1"
-services:
-  tvheadend:
-    image: linuxserver/tvheadend
-    container_name: tvheadend
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/London
-      - RUN_OPTS=<run options here> #optional
-    volumes:
-      - <path to data>:/config
-      - <path to recordings>:/recordings
-    ports:
-      - 9981:9981
-      - 9982:9982
-    devices:
-      - /dev/dri:/dev/dri #optional
-      - /dev/dvb:/dev/dvb #optional
-    restart: unless-stopped
-```
-
-## 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.
-
-| Parameter | Function |
-| :----: | --- |
-| `-p 9981` | WebUI |
-| `-p 9982` | HTSP server 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. |
-| `-e RUN_OPTS=<run options here>` | Optionally specify additional arguments to be passed. See Additional runtime parameters. |
-| `-v /config` | Where TVHeadend show store it's config files. |
-| `-v /recordings` | Where you want the PVR to store recordings. |
-| `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
-| `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |
-
-## Environment variables from files (Docker secrets)
-
-You can set any environment variable from a file by using a special prepend `FILE__`.
-
-As an example:
-
-```
--e FILE__PASSWORD=/run/secrets/mysecretpassword
-```
-
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
-
-## Umask for running applications
-
-For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
-Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
-
-## 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`.
-
-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:
-
-```
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
-```
-
-
-&nbsp;
 ## Application Setup
 
 The setup depends if you run the one of the stable tags or use latest. Running latest is the easiest as it has a setup wizard.
@@ -226,19 +113,120 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]
 
 **Picons**
 
-We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+We have added all the picons from [picons](https://github.com/picons/picons) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
 You need to enable minimum advanced view level to see the picons options.
 
 ## Additional runtime parameters
 
 In some cases it might be necessary to start tvheadend with additional parameters, for example to enable debugging or specify webroot for reverse proxy. Be sure to have the right parameters set, as adding the wrong once might lead to the container not starting correctly.
 
+## Usage
+
+Here are some example snippets to help you get started creating a container.
+
+### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
+
+```yaml
+---
+version: "2.1"
+services:
+  tvheadend:
+    image: lscr.io/linuxserver/tvheadend:latest
+    container_name: tvheadend
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+      - RUN_OPTS= #optional
+    volumes:
+      - /path/to/data:/config
+      - /path/to/recordings:/recordings
+    ports:
+      - 9981:9981
+      - 9982:9982
+    devices:
+      - /dev/dri:/dev/dri #optional
+      - /dev/dvb:/dev/dvb #optional
+    restart: unless-stopped
+```
+
+### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
+
+```bash
+docker run -d \
+  --name=tvheadend \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  -e TZ=Etc/UTC \
+  -e RUN_OPTS= `#optional` \
+  -p 9981:9981 \
+  -p 9982:9982 \
+  -v /path/to/data:/config \
+  -v /path/to/recordings:/recordings \
+  --device /dev/dri:/dev/dri `#optional` \
+  --device /dev/dvb:/dev/dvb `#optional` \
+  --restart unless-stopped \
+  lscr.io/linuxserver/tvheadend:latest
+
+```
+
+#### Host vs. Bridge
+
+If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
+If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macvlan.
+
+## 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.
+
+| Parameter | Function |
+| :----: | --- |
+| `-p 9981` | WebUI |
+| `-p 9982` | HTSP server port. |
+| `-e PUID=1000` | for UserID - see below for explanation |
+| `-e PGID=1000` | for GroupID - see below for explanation |
+| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
+| `-e RUN_OPTS=` | Optionally specify additional arguments to be passed. See Additional runtime parameters. |
+| `-v /config` | Where TVHeadend show store it's config files. |
+| `-v /recordings` | Where you want the PVR to store recordings. |
+| `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
+| `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |
+
+## Environment variables from files (Docker secrets)
+
+You can set any environment variable from a file by using a special prepend `FILE__`.
+
+As an example:
+
+```bash
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
+```
+
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+
+## Umask for running applications
+
+For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
+Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
+
+## 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`.
+
+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:
+
+```bash
+  $ id username
+    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
 
 ## Docker Mods
-[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27tvheadend%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=tvheadend "view available mods for this container.")
 
-We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=tvheadend&query=%24.mods%5B%27tvheadend%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=tvheadend "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
 
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
 
 ## Support Info
 
@@ -247,7 +235,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' tvheadend`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/tvheadend`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/tvheadend:latest`
 
 ## Updating Info
 
@@ -255,48 +243,57 @@ Most of our images are static, versioned, and require an image update and contai
 
 Below are the instructions for updating containers:
 
-### Via Docker Run/Create
-* Update the image: `docker pull linuxserver/tvheadend`
-* Stop the running container: `docker stop tvheadend`
-* Delete the container: `docker rm tvheadend`
-* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* Start the new container: `docker start tvheadend`
-* You can also remove the old dangling images: `docker image prune`
-
 ### Via Docker Compose
+
 * Update all images: `docker-compose pull`
   * or update a single image: `docker-compose pull tvheadend`
 * Let compose update all containers as necessary: `docker-compose up -d`
   * or update a single container: `docker-compose up -d tvheadend`
 * You can also remove the old dangling images: `docker image prune`
 
-### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
+### Via Docker Run
+
+* Update the image: `docker pull lscr.io/linuxserver/tvheadend:latest`
+* Stop the running container: `docker stop tvheadend`
+* Delete the container: `docker rm tvheadend`
+* 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`
+
+### 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 tvheadend
   ```
 
-**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.
-
 * 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).
+
+### 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.
+
 ## Building locally
 
 If you want to make local modifications to these images for development purposes or just to customize the logic:
-```
+
+```bash
 git clone https://github.com/linuxserver/docker-tvheadend.git
 cd docker-tvheadend
 docker build \
   --no-cache \
   --pull \
-  -t linuxserver/tvheadend:latest .
+  -t lscr.io/linuxserver/tvheadend:latest .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-```
+
+```bash
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
@@ -304,6 +301,16 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.09.23:** - Add perl-json-xs package.
+* **18.05.23:** - Install XMLTV from Alpine repos.
+* **18.05.23:** - Rebase to Alpine 3.18.
+* **17.03.23:** - Extract picons during build instead of init.
+* **23.02.23:** - Rebase to Alpine 3.17, migrate to s6v3, drop armhf support.
+* **31.08.22:** - Update sample env vars and how RUN_OPTS are handled.
+* **19.08.22:** - Switch to new picons builder.
+* **16.04.22:** - Added URL XMLTV grabber.
+* **05.01.22:** - Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv.
+* **11.05.21:** - Added Intel iHD driver support.
 * **02.06.20:** - Update to Alpine 3.12.
 * **27.12.19:** - Add requests and perl-json-xs package.
 * **27.12.19:** - Update to Alpine 3.11.

jenkins-vars.yml

@@ -6,6 +6,7 @@ external_type: github_commit
 release_type: stable
 release_tag: latest
 ls_branch: master
+build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'tvheadend'

package_versions.txt

@@ -1,255 +1,288 @@
-alpine-baselayout-3.2.0-r7
-alpine-keys-2.2-r0
-alsa-lib-1.2.2-r0
-aom-libs-1.0.0-r1
-apk-tools-2.10.5-r1
-bash-5.0.17-r0
-brotli-libs-1.0.7-r5
-bsd-compat-headers-0.7.2-r3
-busybox-1.31.1-r19
-bzip2-1.0.8-r1
-ca-certificates-20191127-r4
-ca-certificates-bundle-20191127-r4
-coreutils-8.32-r0
-curl-7.69.1-r0
-expat-2.2.9-r1
-ffmpeg-4.3.1-r0
-ffmpeg-libs-4.3.1-r0
-fontconfig-2.13.1-r2
-freetype-2.10.2-r0
-fribidi-1.0.9-r0
-fts-1.2.7-r1
-gdbm-1.13-r1
-gmp-6.2.0-r0
-gnu-libiconv-1.15-r2
-gnutls-3.6.14-r0
-gzip-1.10-r0
-lame-3.100-r0
-libacl-2.2.53-r0
-libass-0.14.0-r0
-libattr-2.4.48-r0
-libbsd-0.10.0-r0
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1g-r0
-libcurl-7.69.1-r0
-libdav1d-0.7.0-r0
-libdrm-2.4.102-r0
-libdvbcsa-1.1.0-r1
-libelf-0.179-r0
-libffi-3.3-r2
-libgcc-9.3.0-r2
-libgcrypt-1.8.5-r0
-libgpg-error-1.37-r0
-libhdhomerun-libs-20200225-r0
-libidn-1.35-r0
-libidn2-2.3.0-r0
-libintl-0.20.2-r0
-libjpeg-turbo-2.0.5-r0
-libogg-1.3.4-r0
-libpciaccess-0.16-r0
-libpng-1.6.37-r1
-libproc-3.3.16-r0
-libssh-0.9.4-r0
-libssl1.1-1.1.1g-r0
-libstdc++-9.3.0-r2
-libtasn1-4.16.0-r1
-libtheora-1.1.1-r14
-libtls-standalone-2.9.1-r1
-libunistring-0.9.10-r0
-liburiparser-0.9.3-r1
-libuuid-2.35.2-r0
-libva-2.7.1-r0
-libva-intel-driver-2.4.0-r1
-libvdpau-1.4-r0
-libvorbis-1.3.6-r2
-libvpx-1.8.2-r0
-libx11-1.6.11-r0
-libxau-1.0.9-r0
-libxcb-1.14-r1
-libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxfixes-5.0.3-r2
-libxml2-2.9.10-r4
-libxshmfence-1.3-r0
-libxslt-1.1.34-r0
-linux-headers-5.4.5-r1
-linux-pam-1.3.1-r4
-llvm10-libs-10.0.0-r2
-mesa-20.0.7-r0
-mesa-dri-ati-20.0.7-r0
-mesa-dri-classic-20.0.7-r0
-mesa-dri-gallium-20.0.7-r0
-mesa-glapi-20.0.7-r0
-mesa-va-gallium-20.0.7-r0
-mesa-vdpau-gallium-20.0.7-r0
-musl-1.1.24-r9
-musl-utils-1.1.24-r9
-ncurses-libs-6.2_p20200523-r0
-ncurses-terminfo-base-6.2_p20200523-r0
-nettle-3.5.1-r1
-nghttp2-libs-1.41.0-r0
-openssl-1.1.1g-r0
-opus-1.3.1-r0
-p11-kit-0.23.20-r5
-pcre2-10.35-r0
-perl-5.30.3-r0
-perl-archive-zip-1.68-r0
-perl-b-hooks-endofscope-0.24-r1
-perl-boolean-0.46-r1
-perl-canary-stability-2013-r0
-perl-capture-tiny-0.48-r1
-perl-cgi-4.47-r0
-perl-class-data-inheritable-0.08-r1
-perl-class-inspector-1.36-r1
-perl-class-methodmaker-2.24-r6
-perl-class-singleton-1.5-r1
-perl-common-sense-3.75-r0
-perl-compress-raw-bzip2-2.093-r1
-perl-compress-raw-zlib-2.093-r1
-perl-cpan-meta-check-0.014-r1
-perl-data-dumper-2.173-r3
-perl-date-manip-6.81-r0
-perl-datetime-1.52-r0
-perl-datetime-format-strptime-1.77-r0
-perl-datetime-locale-1.25-r0
-perl-datetime-timezone-2.39-r0
-perl-dbd-sqlite-1.64-r2
-perl-dbi-1.643-r0
-perl-devel-stacktrace-2.04-r1
-perl-devel-symdump-2.18-r1
-perl-digest-sha1-2.13-r12
-perl-dist-checkconflicts-0.11-r1
-perl-doc-5.30.3-r0
-perl-encode-locale-1.05-r2
-perl-eval-closure-0.14-r1
-perl-exception-class-1.44-r1
-perl-exporter-tiny-1.002002-r0
-perl-file-listing-6.04-r2
-perl-file-sharedir-1.116-r1
-perl-file-sharedir-install-0.13-r1
-perl-file-slurp-9999.30-r0
-perl-file-temp-0.2309-r1
-perl-file-which-1.23-r1
-perl-getopt-long-2.51-r1
-perl-html-parser-3.72-r5
-perl-html-tagset-3.20-r2
-perl-html-tree-5.07-r1
-perl-http-cookies-6.08-r0
-perl-http-daemon-6.10-r0
-perl-http-date-6.05-r0
-perl-http-message-6.24-r0
-perl-http-negotiate-6.01-r2
-perl-importer-0.025-r0
-perl-io-1.42-r0
-perl-io-compress-2.093-r0
-perl-io-html-1.001-r2
-perl-io-socket-ssl-2.068-r0
-perl-io-stringy-2.113-r0
-perl-ipc-run3-0.048-r1
-perl-json-4.02-r0
-perl-json-xs-4.02-r1
-perl-libwww-6.44-r0
-perl-lingua-en-numbers-ordinate-1.04-r2
-perl-lingua-preferred-0.2.4-r2
-perl-list-moreutils-0.428-r0
-perl-list-moreutils-xs-0.428-r3
-perl-lwp-mediatypes-6.04-r0
-perl-lwp-useragent-determined-1.07-r1
-perl-module-build-0.4231-r0
-perl-module-implementation-0.09-r2
-perl-module-metadata-1.000037-r0
-perl-module-pluggable-5.2-r1
-perl-module-runtime-0.016-r3
-perl-mro-compat-0.13-r1
-perl-namespace-autoclean-0.29-r1
-perl-namespace-clean-0.27-r1
-perl-net-http-6.19-r0
-perl-net-libidn-0.12-r8
-perl-net-ssleay-1.88-r0
-perl-package-deprecationmanager-0.17-r1
-perl-package-stash-0.38-r2
-perl-package-stash-xs-0.29-r3
-perl-params-util-1.07-r8
-perl-params-validate-1.29-r3
-perl-params-validationcompiler-0.30-r0
-perl-parse-recdescent-1.967015-r2
-perl-path-class-0.37-r1
-perl-pod-coverage-0.23-r1
-perl-role-tiny-2.001004-r0
-perl-scalar-list-utils-1.55-r0
-perl-scope-guard-0.21-r1
-perl-specio-0.46-r0
-perl-sub-exporter-progressive-0.001013-r1
-perl-sub-identify-0.14-r4
-perl-sub-info-0.002-r1
-perl-sub-install-0.928-r1
-perl-sub-name-0.26-r1
-perl-sub-quote-2.006006-r0
-perl-sub-uplevel-0.2800-r1
-perl-term-progressbar-2.22-r1
-perl-term-readkey-2.38-r3
-perl-term-table-0.015-r0
-perl-test-exception-0.43-r1
-perl-test-fatal-0.014-r2
-perl-test-needs-0.002006-r0
-perl-test-pod-1.52-r1
-perl-test-requires-0.11-r0
-perl-test-simple-1.302175-r0
-perl-test-taint-1.08-r2
-perl-test-warnings-0.030-r0
-perl-test-without-module-0.20-r1
-perl-test2-plugin-nowarnings-0.08-r1
-perl-test2-suite-0.000129-r0
-perl-timedate-2.33-r0
-perl-try-tiny-0.30-r1
-perl-types-serialiser-1.0-r2
-perl-unicode-string-2.10-r1
-perl-uri-1.76-r0
-perl-variable-magic-0.62-r3
-perl-www-robotrules-6.02-r2
-perl-xml-libxml-2.0205-r0
-perl-xml-libxslt-1.99-r0
-perl-xml-namespacesupport-1.12-r1
-perl-xml-parser-2.46-r0
-perl-xml-sax-1.02-r0
-perl-xml-sax-base-1.09-r1
-perl-xml-treepp-0.43-r2
-perl-xml-twig-3.52-r2
-perl-xml-writer-0.625-r3
-perl-yaml-syck-1.32-r0
-procps-3.3.16-r0
-py3-appdirs-1.4.4-r1
-py3-certifi-2020.4.5.1-r0
-py3-chardet-3.0.4-r4
-py3-idna-2.9-r0
-py3-ordered-set-4.0.1-r0
-py3-packaging-20.4-r0
-py3-parsing-2.4.7-r0
-py3-requests-2.23.0-r0
-py3-setuptools-47.0.0-r0
-py3-six-1.15.0-r0
-py3-urllib3-1.25.9-r0
-python2-2.7.18-r0
-python3-3.8.5-r0
-readline-8.0.4-r0
-scanelf-1.2.6-r0
-sdl2-2.0.12-r1
-shadow-4.8.1-r0
-sqlite-libs-3.32.1-r0
-ssl_client-1.31.1-r19
-tar-1.32-r1
-tzdata-2020a-r0
-uriparser-0.9.3-r1
-v4l-utils-libs-1.20.0-r0
-wayland-libs-client-1.18.0-r4
-wget-1.20.3-r1
-x264-20191119-r1
-x264-libs-20191119-r1
-x265-3.3-r1
-x265-libs-3.3-r1
-xvidcore-1.3.7-r1
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
-zstd-libs-1.4.5-r0
+NAME                             VERSION                 TYPE   
+alpine-baselayout                3.4.3-r1                apk     
+alpine-baselayout-data           3.4.3-r1                apk     
+alpine-keys                      2.4-r1                  apk     
+alpine-release                   3.18.3-r0               apk     
+alsa-lib                         1.2.9-r1                apk     
+aom-libs                         3.6.1-r0                apk     
+apk-tools                        2.14.0-r2               apk     
+bash                             5.2.15-r5               apk     
+brotli-libs                      1.0.9-r14               apk     
+bsd-compat-headers               0.7.2-r5                apk     
+busybox                          1.36.1-r2               apk     
+busybox-binsh                    1.36.1-r2               apk     
+ca-certificates                  20230506-r0             apk     
+ca-certificates-bundle           20230506-r0             apk     
+certifi                          2023.5.7                python  
+charset-normalizer               3.1.0                   python  
+cjson                            1.7.15-r4               apk     
+coreutils                        9.3-r1                  apk     
+curl                             8.3.0-r0                apk     
+dbus-libs                        1.14.8-r0               apk     
+ffmpeg                           6.0-r15                 apk     
+ffmpeg-libavcodec                6.0-r15                 apk     
+ffmpeg-libavdevice               6.0-r15                 apk     
+ffmpeg-libavfilter               6.0-r15                 apk     
+ffmpeg-libavformat               6.0-r15                 apk     
+ffmpeg-libavutil                 6.0-r15                 apk     
+ffmpeg-libpostproc               6.0-r15                 apk     
+ffmpeg-libswresample             6.0-r15                 apk     
+ffmpeg-libswscale                6.0-r15                 apk     
+ffmpeg4                          4.4.4-r1                apk     
+ffmpeg4-libavcodec               4.4.4-r1                apk     
+ffmpeg4-libavdevice              4.4.4-r1                apk     
+ffmpeg4-libavfilter              4.4.4-r1                apk     
+ffmpeg4-libavformat              4.4.4-r1                apk     
+ffmpeg4-libavutil                4.4.4-r1                apk     
+ffmpeg4-libpostproc              4.4.4-r1                apk     
+ffmpeg4-libswresample            4.4.4-r1                apk     
+ffmpeg4-libswscale               4.4.4-r1                apk     
+flac-libs                        1.4.3-r0                apk     
+fontconfig                       2.14.2-r3               apk     
+freetype                         2.13.0-r5               apk     
+fribidi                          1.0.13-r0               apk     
+gdbm                             1.23-r1                 apk     
+glib                             2.76.4-r0               apk     
+glslang-libs                     1.3.243.0-r1            apk     
+gmp                              6.2.1-r3                apk     
+gnu-libiconv                     1.17-r1                 apk     
+gnu-libiconv-libs                1.17-r1                 apk     
+gnutls                           3.8.0-r2                apk     
+graphite2                        1.3.14-r5               apk     
+harfbuzz                         7.3.0-r0                apk     
+hwdata-pci                       0.370-r0                apk     
+idna                             3.4                     python  
+intel-gmmlib                     22.3.5-r0               apk     
+intel-media-driver               23.2.3-r0               apk     
+jq                               1.6-r3                  apk     
+lame-libs                        3.100-r5                apk     
+lcms2                            2.15-r2                 apk     
+libacl                           2.3.1-r3                apk     
+libass                           0.17.1-r0               apk     
+libasyncns                       0.8-r1                  apk     
+libattr                          2.5.1-r4                apk     
+libblkid                         2.38.1-r8               apk     
+libbluray                        1.3.4-r0                apk     
+libbsd                           0.11.7-r1               apk     
+libbz2                           1.0.8-r5                apk     
+libc-utils                       0.7.2-r5                apk     
+libcrypto3                       3.1.3-r0                apk     
+libcurl                          8.3.0-r0                apk     
+libdav1d                         1.2.1-r0                apk     
+libdrm                           2.4.115-r4              apk     
+libdvbcsa                        1.1.0-r1                apk     
+libexpat                         2.5.0-r1                apk     
+libffi                           3.4.4-r2                apk     
+libgcc                           12.2.1_git20220924-r10  apk     
+libgcrypt                        1.10.2-r1               apk     
+libgomp                          12.2.1_git20220924-r10  apk     
+libgpg-error                     1.47-r1                 apk     
+libhdhomerun-libs                20200225-r1             apk     
+libhwy                           1.0.4-r1                apk     
+libidn2                          2.3.4-r1                apk     
+libintl                          0.21.1-r7               apk     
+libjpeg-turbo                    2.1.5.1-r3              apk     
+libjxl                           0.8.2-r0                apk     
+libltdl                          2.4.7-r2                apk     
+libmd                            1.0.4-r2                apk     
+libmount                         2.38.1-r8               apk     
+libncursesw                      6.4_p20230506-r0        apk     
+libogg                           1.3.5-r4                apk     
+libopenmpt                       0.7.2-r0                apk     
+libpanelw                        6.4_p20230506-r0        apk     
+libpciaccess                     0.17-r2                 apk     
+libplacebo                       5.264.1-r1              apk     
+libpng                           1.6.39-r3               apk     
+libproc2                         4.0.4-r0                apk     
+libpulse                         16.1-r10                apk     
+librist                          0.2.7-r0                apk     
+libsndfile                       1.2.0-r2                apk     
+libsodium                        1.0.18-r3               apk     
+libsrt                           1.5.2-r0                apk     
+libssh                           0.10.5-r0               apk     
+libssl3                          3.1.3-r0                apk     
+libstdc++                        12.2.1_git20220924-r10  apk     
+libtasn1                         4.19.0-r1               apk     
+libtheora                        1.1.1-r17               apk     
+libunibreak                      5.1-r0                  apk     
+libunistring                     1.1-r1                  apk     
+liburiparser                     0.9.7-r0                apk     
+libva                            2.18.0-r1               apk     
+libva-intel-driver               2.4.1-r0                apk     
+libvdpau                         1.5-r1                  apk     
+libvorbis                        1.3.7-r1                apk     
+libvpx                           1.13.0-r1               apk     
+libwebp                          1.3.2-r0                apk     
+libx11                           1.8.4-r4                apk     
+libxau                           1.0.11-r2               apk     
+libxcb                           1.15-r1                 apk     
+libxdmcp                         1.1.4-r2                apk     
+libxext                          1.3.5-r2                apk     
+libxfixes                        6.0.1-r2                apk     
+libxml2                          2.11.4-r0               apk     
+libxslt                          1.1.38-r0               apk     
+libzmq                           4.3.4-r4                apk     
+linux-headers                    6.3-r0                  apk     
+linux-pam                        1.5.2-r10               apk     
+mbedtls                          2.28.4-r0               apk     
+mesa                             23.0.4-r0               apk     
+mpdecimal                        2.5.1-r2                apk     
+mpg123-libs                      1.31.3-r1               apk     
+musl                             1.2.4-r1                apk     
+musl-utils                       1.2.4-r1                apk     
+ncurses-terminfo-base            6.4_p20230506-r0        apk     
+netcat-openbsd                   1.219-r1                apk     
+nettle                           3.8.1-r2                apk     
+nghttp2-libs                     1.55.1-r0               apk     
+numactl                          2.0.16-r4               apk     
+onevpl-libs                      2023.2.1-r0             apk     
+oniguruma                        6.9.8-r1                apk     
+opus                             1.4-r0                  apk     
+orc                              0.4.34-r0               apk     
+p11-kit                          0.24.1-r2               apk     
+pcre2                            10.42-r1                apk     
+perl                             5.36.1-r2               apk     
+perl-b-hooks-endofscope          0.26-r1                 apk     
+perl-capture-tiny                0.48-r3                 apk     
+perl-class-data-inheritable      0.09-r0                 apk     
+perl-class-inspector             1.36-r2                 apk     
+perl-class-methodmaker           2.24-r9                 apk     
+perl-class-singleton             1.6-r0                  apk     
+perl-clone                       0.46-r1                 apk     
+perl-common-sense                3.75-r3                 apk     
+perl-compress-raw-zlib           2.204-r1                apk     
+perl-date-manip                  6.91-r0                 apk     
+perl-datetime                    1.59-r1                 apk     
+perl-datetime-format-builder     0.83-r1                 apk     
+perl-datetime-format-iso8601     0.16-r0                 apk     
+perl-datetime-format-sqlite      0.11-r4                 apk     
+perl-datetime-format-strptime    1.79-r0                 apk     
+perl-datetime-locale             1.39-r0                 apk     
+perl-datetime-timezone           2.60-r0                 apk     
+perl-dbd-sqlite                  1.72-r1                 apk     
+perl-dbi                         1.643-r5                apk     
+perl-devel-stacktrace            2.04-r4                 apk     
+perl-digest-sha1                 2.13-r16                apk     
+perl-dist-checkconflicts         0.11-r3                 apk     
+perl-encode-locale               1.05-r4                 apk     
+perl-eval-closure                0.14-r3                 apk     
+perl-exception-class             1.45-r0                 apk     
+perl-exporter-tiny               1.006002-r0             apk     
+perl-file-homedir                1.006-r1                apk     
+perl-file-listing                6.15-r0                 apk     
+perl-file-sharedir               1.118-r0                apk     
+perl-file-slurp                  9999.32-r2              apk     
+perl-file-which                  1.27-r0                 apk     
+perl-html-parser                 3.81-r1                 apk     
+perl-html-tagset                 3.20-r4                 apk     
+perl-http-cookies                6.10-r0                 apk     
+perl-http-date                   6.05-r1                 apk     
+perl-http-message                6.44-r0                 apk     
+perl-http-negotiate              6.01-r3                 apk     
+perl-importer                    0.026-r1                apk     
+perl-io-gzip                     0.20-r8                 apk     
+perl-io-html                     1.004-r0                apk     
+perl-io-socket-ssl               2.081-r0                apk     
+perl-ipc-run3                    0.048-r3                apk     
+perl-json                        4.10-r0                 apk     
+perl-json-xs                     4.03-r2                 apk     
+perl-libwww                      6.68-r1                 apk     
+perl-lingua-en-numbers-ordinate  1.05-r0                 apk     
+perl-lingua-preferred            0.2.4-r4                apk     
+perl-list-moreutils              0.430-r0                apk     
+perl-list-moreutils-xs           0.430-r3                apk     
+perl-lwp-mediatypes              6.04-r2                 apk     
+perl-lwp-protocol-https          6.10-r4                 apk     
+perl-lwp-useragent-determined    1.07-r3                 apk     
+perl-module-implementation       0.09-r4                 apk     
+perl-module-pluggable            5.2-r3                  apk     
+perl-module-runtime              0.016-r5                apk     
+perl-mozilla-ca                  20221114-r1             apk     
+perl-mro-compat                  0.15-r1                 apk     
+perl-namespace-autoclean         0.29-r2                 apk     
+perl-namespace-clean             0.27-r3                 apk     
+perl-net-http                    6.22-r0                 apk     
+perl-net-ssleay                  1.92-r4                 apk     
+perl-package-deprecationmanager  0.18-r0                 apk     
+perl-package-stash               0.40-r0                 apk     
+perl-params-util                 1.102-r3                apk     
+perl-params-validate             1.31-r1                 apk     
+perl-params-validationcompiler   0.31-r0                 apk     
+perl-role-tiny                   2.002004-r1             apk     
+perl-scope-guard                 0.21-r3                 apk     
+perl-specio                      0.48-r0                 apk     
+perl-sub-exporter-progressive    0.001013-r3             apk     
+perl-sub-identify                0.14-r9                 apk     
+perl-sub-info                    0.002-r3                apk     
+perl-sub-install                 0.929-r1                apk     
+perl-sub-quote                   2.006008-r0             apk     
+perl-sub-uplevel                 0.2800-r3               apk     
+perl-term-progressbar            2.23-r0                 apk     
+perl-term-readkey                2.38-r8                 apk     
+perl-term-table                  0.016-r1                apk     
+perl-test-exception              0.43-r3                 apk     
+perl-test-fatal                  0.017-r0                apk     
+perl-test-simple                 1.302195-r0             apk     
+perl-test-without-module         0.21-r0                 apk     
+perl-test2-plugin-nowarnings     0.09-r1                 apk     
+perl-test2-suite                 0.000155-r0             apk     
+perl-timedate                    2.33-r2                 apk     
+perl-try-tiny                    0.31-r1                 apk     
+perl-types-serialiser            1.01-r0                 apk     
+perl-unicode-string              2.10-r4                 apk     
+perl-uri                         5.19-r0                 apk     
+perl-www-robotrules              6.02-r3                 apk     
+perl-xml-libxml                  2.0208-r1               apk     
+perl-xml-namespacesupport        1.12-r3                 apk     
+perl-xml-parser                  2.46-r5                 apk     
+perl-xml-sax                     1.02-r1                 apk     
+perl-xml-sax-base                1.09-r3                 apk     
+perl-xml-treepp                  0.43-r3                 apk     
+perl-xml-twig                    3.52-r4                 apk     
+perl-xml-writer                  0.900-r1                apk     
+procps-ng                        4.0.4-r0                apk     
+py3-certifi                      2023.5.7-r0             apk     
+py3-certifi-pyc                  2023.5.7-r0             apk     
+py3-charset-normalizer           3.1.0-r1                apk     
+py3-charset-normalizer-pyc       3.1.0-r1                apk     
+py3-idna                         3.4-r4                  apk     
+py3-idna-pyc                     3.4-r4                  apk     
+py3-requests                     2.31.0-r0               apk     
+py3-requests-pyc                 2.31.0-r0               apk     
+py3-urllib3                      1.26.15-r1              apk     
+py3-urllib3-pyc                  1.26.15-r1              apk     
+pyc                              0.1-r0                  apk     
+python3                          3.11.5-r0               apk     
+python3-pyc                      3.11.5-r0               apk     
+python3-pycache-pyc0             3.11.5-r0               apk     
+readline                         8.2.1-r1                apk     
+requests                         2.31.0                  python  
+scanelf                          1.3.7-r1                apk     
+sdl2                             2.26.5-r0               apk     
+shaderc                          2023.3-r1               apk     
+shadow                           4.13-r4                 apk     
+skalibs                          2.13.1.1-r1             apk     
+soxr                             0.1.3-r5                apk     
+speexdsp                         1.2.1-r1                apk     
+spirv-tools                      1.3.243.0-r1            apk     
+sqlite-libs                      3.41.2-r2               apk     
+ssl_client                       1.36.1-r2               apk     
+svt-av1-libs                     1.6.0-r0                apk     
+tdb-libs                         1.4.8-r1                apk     
+tzdata                           2023c-r1                apk     
+uriparser                        0.9.7-r0                apk     
+urllib3                          1.26.15                 python  
+utmps-libs                       0.1.2.1-r1              apk     
+v4l-utils-libs                   1.24.1-r0               apk     
+vidstab                          1.1.1-r0                apk     
+vulkan-loader                    1.3.243.0-r1            apk     
+wayland-libs-client              1.22.0-r2               apk     
+x264                             0.164_git20220602-r1    apk     
+x264-libs                        0.164_git20220602-r1    apk     
+x265                             3.5-r4                  apk     
+x265-libs                        3.5-r4                  apk     
+xmltv                            1.2.1-r3                apk     
+xvidcore                         1.3.7-r1                apk     
+xz-libs                          5.4.3-r0                apk     
+zimg                             3.0.5-r0                apk     
+zlib                             1.2.13-r1               apk     

patches/cpanfile

@@ -1,22 +0,0 @@
-requires 'perl' => '5.24.0';
-
-# perl packages for tvheadend x86
-requires 'DateTime::Format::ISO8601' ;
-requires 'DateTime::Format::SQLite' ;
-requires 'Encode' ;
-requires 'File::HomeDir' ;
-requires 'File::Path' ;
-requires 'HTML::Entities' ;
-requires 'HTML::TableExtract' ;
-requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ;
-requires 'inc' ;
-requires 'JSON::PP' ;
-requires 'LWP::Simple' ;
-requires 'LWP::UserAgent' ;
-requires 'PerlIO::gzip' ;
-requires 'SOAP::Lite' ;
-requires 'Storable' ;
-requires 'Unicode::UTF8simple' ;
-requires 'version' ;
-requires 'WWW::Mechanize' ;
-requires 'XML::DOM' ;

patches/test_tv_imdb.t.patch

@@ -1,20 +0,0 @@
----
- t/test_tv_imdb.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
-index ad504464..4dc281a1 100755
---- a/t/test_tv_imdb.t
-+++ b/t/test_tv_imdb.t
-@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
-     my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
- 
-     # Make temporary directory and split into it.
--    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
-+    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
-     if ( $input=~m/movies-only/ ) {
--	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
-+	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
-     }
-     #print STDERR "\nRUN:$cmd\n";
-     my $r = system($cmd);

readme-vars.yml

@@ -15,16 +15,13 @@ project_blurb_optional_extras_enabled: false
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 # development version
-development_versions: true
+development_versions: false
 development_versions_items:
   - { tag: "latest", desc: "Current latest release." }
   - { tag: "release-4.2", desc: "Latest release from 4.2 branch." }
-  - { tag: "stable-4.2.1", desc: "Old stable version. Will not be updated anymore!" }
-  - { tag: "stable-4.0.9", desc: "Old stable version. Will not be updated anymore!" }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -35,8 +32,8 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "<path to data>", desc: "Where TVHeadend show store it's config files." }
-  - { vol_path: "/recordings", vol_host_path: "<path to recordings>", desc: "Where you want the PVR to store recordings." }
+  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where TVHeadend show store it's config files." }
+  - { vol_path: "/recordings", vol_host_path: "/path/to/recordings", desc: "Where you want the PVR to store recordings." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "9981", internal_port: "9981", port_desc: "WebUI" }
@@ -47,7 +44,7 @@ cap_add_param: false
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
-  - { env_var: "RUN_OPTS", env_value: "<run options here>", desc: "Optionally specify additional arguments to be passed. See Additional runtime parameters." }
+  - { env_var: "RUN_OPTS", env_value: "", desc: "Optionally specify additional arguments to be passed. See Additional runtime parameters." }
 opt_param_usage_include_vols: false
 opt_param_usage_include_ports: false
 opt_param_device_map: true
@@ -61,7 +58,7 @@ optional_block_1_items:
     #### Host vs. Bridge
 
     If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-    If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
+    If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macvlan.
 
 # application setup block
 app_setup_block_enabled: true
@@ -117,7 +114,7 @@ app_setup_block: |
 
   **Picons**
 
-  We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+  We have added all the picons from [picons](https://github.com/picons/picons) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
   You need to enable minimum advanced view level to see the picons options.
 
   ## Additional runtime parameters
@@ -126,6 +123,16 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.09.23:", desc: "Add perl-json-xs package." }
+  - { date: "18.05.23:", desc: "Install XMLTV from Alpine repos." }
+  - { date: "18.05.23:", desc: "Rebase to Alpine 3.18." }
+  - { date: "17.03.23:", desc: "Extract picons during build instead of init." }
+  - { date: "23.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, drop armhf support." }
+  - { date: "31.08.22:", desc: "Update sample env vars and how RUN_OPTS are handled." }
+  - { date: "19.08.22:", desc: "Switch to new picons builder." }
+  - { date: "16.04.22:", desc: "Added URL XMLTV grabber." }
+  - { date: "05.01.22:", desc: "Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv." }
+  - { date: "11.05.21:", desc: "Added Intel iHD driver support." }
   - { date: "02.06.20:", desc: "Update to Alpine 3.12." }
   - { date: "27.12.19:", desc: "Add requests and perl-json-xs package." }
   - { date: "27.12.19:", desc: "Update to Alpine 3.11." }

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

@@ -1,46 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make folders
-mkdir -p \
-	/config/comskip
-
-# copy config
-[[ ! -e /config/dvr/config ]] && \
-	(mkdir -p /config/dvr/config && cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/dvr/config/7a5edfbe189851e5b1d1df19c93962f0)
-[[ ! -e /config/comskip/comskip.ini ]] && \
-	cp /defaults/comskip.ini.org /config/comskip/comskip.ini
-[[ ! -e /config/config ]] && \
-        (cp /defaults/config /config/config)
-
-# extract picons on first run
-[[ -f /picons.tar.bz2 ]] && \
-	tar xf \
-		/picons.tar.bz2 -C \
-		/picons &&
-	rm -f /picons.tar.bz2
-
-# function to randomly sample 5 files for their owner and only chown if not abc
-chowner () {
-files=(${1}/*)
-for i in {1..5}; do
-        user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}"))
-        if [ "${user}" != "abc" ]; then
-                chown -R abc:abc ${1}
-                break
-        fi
-done
-}
-
-# permissions
-echo "Setting permissions"
-abc_dirs=( \
-/config \
-/picons \
-)
-for i in "${abc_dirs[@]}"; do
-        if [ "$(ls -A ${i})" ]; then
-                chowner ${i}
-        else
-                chown -R abc:abc ${i}
-        fi
-done

root/etc/cont-init.d/50-gid-video

@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
-
-for i in $FILES
-do
-	VIDEO_GID=$(stat -c '%g' "$i")
-	if id -G abc | grep -qw "$VIDEO_GID"; then
-		touch /groupadd
-	else
-		if [ ! "${VIDEO_GID}" == '0' ]; then
-			VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
-			if [ -z "${VIDEO_NAME}" ]; then
-				VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c8)"
-				groupadd "$VIDEO_NAME"
-				groupmod -g "$VIDEO_GID" "$VIDEO_NAME"
-			fi
-			usermod -a -G "$VIDEO_NAME" abc
-			touch /groupadd
-		fi
-	fi
-done
-
-if [ -n "${FILES}" ] && [ ! -f "/groupadd" ]; then
-	usermod -a -G root abc
-fi

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

@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# make folders
+mkdir -p \
+    /config/comskip
+
+# copy config
+if [[ ! -e /config/dvr/config ]]; then
+    (mkdir -p /config/dvr/config && cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/dvr/config/7a5edfbe189851e5b1d1df19c93962f0)
+fi
+if [[ ! -e /config/comskip/comskip.ini ]]; then
+    cp /defaults/comskip.ini.org /config/comskip/comskip.ini
+fi
+if [[ ! -e /config/config ]]; then
+    (cp /defaults/config /config/config)
+fi
+
+# permissions
+echo "Setting permissions"
+lsiown -R abc:abc /config

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

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

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

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

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

@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
+
+for i in $FILES
+do
+    VIDEO_GID=$(stat -c '%g' "$i")
+    if id -G abc | grep -qw "$VIDEO_GID"; then
+        touch /groupadd
+    else
+        if [ ! "${VIDEO_GID}" == '0' ]; then
+            VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
+            if [ -z "${VIDEO_NAME}" ]; then
+                VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c8)"
+                groupadd "$VIDEO_NAME"
+                groupmod -g "$VIDEO_GID" "$VIDEO_NAME"
+            fi
+            usermod -a -G "$VIDEO_NAME" abc
+            touch /groupadd
+        fi
+    fi
+done
+
+if [ -n "${FILES}" ] && [ ! -f "/groupadd" ]; then
+    usermod -a -G root abc
+fi

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9981" \
+        s6-setuidgid abc /usr/bin/tvheadend -C -c /config $RUN_OPTS

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

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

root/etc/services.d/tvheadend/run

@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
-
-exec \
-        s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"

root/usr/bin/tv_grab_url

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+dflag=
+vflag=
+cflag=
+
+if (( $# < 1 ))
+then
+  exit 0
+fi
+
+OPTARG=""
+URL=$1
+
+for arg
+do
+    delim=""
+    case "$arg" in
+    #translate --gnu-long-options to -g (short options)
+       --description) args="${args}-d ";;
+       --version) args="${args}-v ";;
+       --capabilities) args="${args}-c ";;
+       #pass through anything else
+       *) if [ "${arg:0:1}" == "-" ] || delim="\""
+          then
+           args="${args}${delim}${arg}${delim} "
+          else
+           OPTARG=${arg}
+          fi
+    esac
+done
+
+#Reset the positional parameters to the short options
+eval set -- $args
+
+while getopts "dvc" option
+do
+    case $option in
+        d)  dflag=1;;
+        v)  vflag=1;;
+        c)  cflag=1;;
+        \?) printf "unknown option: -%s\n" $OPTARG
+            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
+            exit 2
+            ;;
+    esac >&2
+done
+
+if [ "$dflag" ]
+then
+   printf "XMLTV URL grabber\n"
+   exit 0
+fi
+if [ "$vflag" ]
+then
+   printf "0.1\n"
+   exit 0
+fi
+if [ "$cflag" ]
+then
+   printf "baseline\n"
+   exit 0
+fi
+
+curl -s "$URL"
+
+exit 0