Fix path to binary

.editorconfig

@@ -1,20 +0,0 @@
-# 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/cont-init.d/**,root/etc/services.d/**}]
-indent_style = space
-indent_size = 4

.github/CONTRIBUTING.md

@@ -1,123 +0,0 @@
-# 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,14 +1,9 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
 
-<!--- Provide a general summary of the bug in the Title above -->
+<!--- Provide a general summary of the issue in the Title above -->
 
 ------------------------------
 
@@ -27,10 +22,9 @@ about: Create a report to help us improve
 4.
 
 ## Environment
-**OS:**
+**OS:**      
-**CPU architecture:** x86_64/arm32/arm64
+**CPU architecture:** x86_64/arm32/arm64      
-**How docker service was installed:**
+**How docker service was installed:**      
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
 ## Command used to create docker container (run/create/compose/screenshot)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +0,0 @@
-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.feature.md

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

.github/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, documentation, or 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 or documentation in 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,11 +21,7 @@
 
 ------------------------------
 
- - [ ] 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.
-
-------------------------------
-
-<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
 
 ## Description:
 <!--- Describe your changes in detail -->

.github/workflows/external_trigger.yml

@@ -1,92 +0,0 @@
-name: External Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  external-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.3
-
-      - 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. ****"
-            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 "**** 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 "**** 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}" \
-            | jq -r '.container_config')
-          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} ****"
-          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-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 ****"
-            exit 0
-          else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-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 "**** 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

@@ -1,43 +0,0 @@
-name: External Trigger Scheduler
-
-on:
-  schedule:
-    - cron:  '03 * * * *'
-  workflow_dispatch:
-
-jobs:
-  external-trigger-scheduler:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.3
-        with:
-          fetch-depth: '0'
-
-      - name: External Trigger Scheduler
-        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
-          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-tvheadend/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            if [ "$br" == "$ls_branch" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              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} ****."
-                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. ****"
-              fi
-            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
-            fi
-          done

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        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/blob/master/.github/PULL_REQUEST_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)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -1,38 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.3
-
-      - 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. ****"
-            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 ****"
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_TVHEADEND_MASTER\". ****"
-          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 "**** 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

@@ -1,50 +0,0 @@
-name: Package Trigger Scheduler
-
-on:
-  schedule:
-    - cron:  '52 14 * * 0'
-  workflow_dispatch:
-
-jobs:
-  package-trigger-scheduler:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.3
-        with:
-          fetch-depth: '0'
-
-      - name: Package Trigger Scheduler
-        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
-          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-tvheadend/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              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}. ****"
-                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. ****"
-              fi
-            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
-            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/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3
+    - 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."

.gitignore

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

Dockerfile

@@ -1,225 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
+FROM lsiobase/ubuntu:bionic
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v1.0.0"
-
-# 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 \
-	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-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-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 \
-	python3 \
-	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 -s -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 "**** 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-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 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 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
-
-############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -227,110 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
+# package version
-ENV HOME="/config"
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
+ apt-get update && \
- apk add --no-cache \
+ apt-get upgrade -qy && \
-	bsd-compat-headers \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
+	cmake \
-	ffmpeg \
+	dvb-apps \
-	ffmpeg-libs \
+	gettext \
-	gnu-libiconv \
+	git \
 	gzip \
-	libcrypto1.1 \
+	jq \
-	libcurl \
+	libavahi-client-dev \
-	libdvbcsa \
+	libdvbcsa-dev \
-	libhdhomerun-libs \
+	libhdhomerun-dev \
-	libssl1.1 \
+	libiconv-hook-dev \
-	libva \
+	libssl-dev \
-	libva-intel-driver \
+	libtool \
-	intel-media-driver \
+	libva-dev \
-	mesa-dri-ati \
+	pkg-config \
-	libvpx \
+	python \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	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-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 \
 	python3 \
-	tar \
+	python3-requests \
-	uriparser \
 	wget \
-	x264 \
+	zlib1g-dev && \
-	x265 \
+ echo "**** build tvheadend ****" && \
-	zlib && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** build comskip ****" && \
+ git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ cd /tmp/comskip && \
+ ./autogen.sh && \
+ ./configure \
+	--bindir=/usr/bin \
+	--sysconfdir=/config/comskip && \
+ make && \
+ make install && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
- curl -s -o \
+ curl -o \
         /picons.tar.bz2 -L \
         https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
 
-# copy local files and buildstage artifacts
+# copy local files
-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
+VOLUME /config

Dockerfile.aarch64

@@ -1,223 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as buildstage
+FROM lsiobase/ubuntu:arm64v8-bionic
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v1.0.0"
-
-# 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-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-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 \
-	python3 \
-	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 "**** 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-execinfo \
-	--disable-hdhomerun_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--enable-pngquant \
-	--enable-trace \
-	--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 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 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
-
-############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -225,106 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
+# package version
-ENV HOME="/config"
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
+ apt-get update && \
- apk add --no-cache \
+ apt-get upgrade -qy && \
-	bsd-compat-headers \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
+	cmake \
-	ffmpeg \
+	dvb-apps \
-	ffmpeg-libs \
+	gettext \
-	gnu-libiconv \
+	git \
 	gzip \
-	libcrypto1.1 \
+	jq \
-	libcurl \
+	libavahi-client-dev \
-	libdvbcsa \
+	libdvbcsa-dev \
-	libhdhomerun-libs \
+	libhdhomerun-dev \
-	libssl1.1 \
+	libiconv-hook-dev \
-	libvpx \
+	libssl-dev \
-	libxml2 \
+	libtool \
-	libxslt \
+	libva-dev \
-	linux-headers \
+	pkg-config \
-	openssl \
+	python \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	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-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 \
 	python3 \
-	tar \
+	python3-requests \
-	uriparser \
 	wget \
-	x264 \
+	zlib1g-dev && \
-	x265 \
+ echo "**** build tvheadend ****" && \
-	zlib && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** build comskip ****" && \
+ git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ cd /tmp/comskip && \
+ ./autogen.sh && \
+ ./configure \
+	--bindir=/usr/bin \
+	--sysconfdir=/config/comskip && \
+ make && \
+ make install && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  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 local files
-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
+VOLUME /config

Dockerfile.armhf

@@ -1,224 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as buildstage
+FROM lsiobase/ubuntu:arm32v7-bionic
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v1.0.0"
-
-# 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-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-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 \
-	python3 \
-	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 "**** 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-execinfo \
-	--disable-hdhomerun_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--enable-pngquant \
-	--enable-trace \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--nowerror \
-	--prefix=/usr \
-	--python=python3 \
-	--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 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
-
-############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -226,106 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
+# package version
-ENV HOME="/config"
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
+ apt-get update && \
- apk add --no-cache \
+ apt-get upgrade -qy && \
-	bsd-compat-headers \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
+	cmake \
-	ffmpeg \
+	dvb-apps \
-	ffmpeg-libs \
+	gettext \
-	gnu-libiconv \
+	git \
 	gzip \
-	libcrypto1.1 \
+	jq \
-	libcurl \
+	libavahi-client-dev \
-	libdvbcsa \
+	libdvbcsa-dev \
-	libhdhomerun-libs \
+	libhdhomerun-dev \
-	libssl1.1 \
+	libiconv-hook-dev \
-	libvpx \
+	libssl-dev \
-	libxml2 \
+	libtool \
-	libxslt \
+	libva-dev \
-	linux-headers \
+	pkg-config \
-	openssl \
+	python \
-	opus \
-	pcre2 \
-	perl \
-	perl-archive-zip \
-	perl-boolean \
-	perl-capture-tiny \
-	perl-cgi \
-	perl-compress-raw-zlib \
-	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-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 \
 	python3 \
-	tar \
+	python3-requests \
-	uriparser \
 	wget \
-	x264 \
+	zlib1g-dev && \
-	x265 \
+ echo "**** build tvheadend ****" && \
-	zlib && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** build comskip ****" && \
+ git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ cd /tmp/comskip && \
+ ./autogen.sh && \
+ ./configure \
+	--bindir=/usr/bin \
+	--sysconfdir=/config/comskip && \
+ make && \
+ make install && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  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 local files
-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
+VOLUME /config

Jenkinsfile

@@ -16,7 +16,6 @@ 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'
@@ -27,8 +26,8 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
     PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
-    DIST_IMAGE = 'alpine'
+    DIST_IMAGE = 'ubuntu'
-    MULTIARCH='true'
+    MULTIARCH='false'
     CI='true'
     CI_WEB='true'
     CI_PORT='9981'
@@ -45,7 +44,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/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 alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':j0nny 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' ''',
@@ -59,7 +58,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 .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          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'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -107,7 +106,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-           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 ''',
+           script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
            returnStdout: true).trim()
        }
      }
@@ -127,76 +126,46 @@ 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")
-          }
-
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a j0nny build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + 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
           } 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
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "j0nny"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/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
           } 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/'
         }
       }
@@ -209,17 +178,14 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/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
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-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/'
         }
@@ -232,24 +198,24 @@ pipeline {
       }
       steps {
         withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
         ]) {
           script{
-            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
           sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
                 set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
+                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=\"${S3_SECRET}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                -t lsiodev/spaces-file-upload:latest \
                 python /upload.py'''
         }
       }
@@ -257,7 +223,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -267,67 +233,20 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              docker pull 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 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins 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"
-              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 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}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; 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
+                git checkout -f j0nny
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  echo ".jenkins-external" >> .gitignore
-                  git add .gitignore
-                fi
                 git add ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
@@ -337,34 +256,13 @@ pipeline {
               fi
               mkdir -p ${TEMPDIR}/gitbook
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              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
+              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}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/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
-              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(
@@ -376,7 +274,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -409,94 +307,31 @@ 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
-              set -e
-              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 {
-        expression {
+        environment name: 'MULTIARCH', value: 'false'
-          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
-        }
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Running on node: ${NODE_NAME}"
+        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
-        sh "docker build \
+        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-          --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} \
-          --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 {
-        allOf {
+        environment name: 'MULTIARCH', value: 'true'
-          environment name: 'MULTIARCH', value: 'true'
-          expression { params.PACKAGE_CHECK == 'false' }
-        }
         environment name: 'EXIT_STATUS', value: ''
       }
       parallel {
         stage('Build X86') {
           steps {
-            echo "Running on node: ${NODE_NAME}"
+            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
-            sh "docker build \
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              --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} \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
         stage('Build ARMHF') {
@@ -504,33 +339,28 @@ pipeline {
             label 'ARMHF'
           }
           steps {
-            echo "Running on node: ${NODE_NAME}"
+            withCredentials([
-            echo 'Logging into Github'
+              [
-            sh '''#! /bin/bash
+                $class: 'UsernamePasswordMultiBinding',
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-               '''
+                usernameVariable: 'DOCKERUSER',
-            sh "docker build \
+                passwordVariable: 'DOCKERPASS'
-              --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\" \
+              echo 'Logging into DockerHub'
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-tvheadend\" \
+              sh '''#! /bin/bash
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-tvheadend\" \
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+                 '''
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              retry(5) {
-              --label \"org.opencontainers.image.title=Tvheadend\" \
+                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              --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.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+              sh '''docker rmi \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+                    ${IMAGE}:arm32v7-${META_TAG} \
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
           }
         }
         stage('Build ARM64') {
@@ -538,33 +368,28 @@ pipeline {
             label 'ARM64'
           }
           steps {
-            echo "Running on node: ${NODE_NAME}"
+            withCredentials([
-            echo 'Logging into Github'
+              [
-            sh '''#! /bin/bash
+                $class: 'UsernamePasswordMultiBinding',
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-               '''
+                usernameVariable: 'DOCKERUSER',
-            sh "docker build \
+                passwordVariable: 'DOCKERPASS'
-              --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\" \
+              echo 'Logging into DockerHub'
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-tvheadend\" \
+              sh '''#! /bin/bash
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-tvheadend\" \
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+                 '''
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              retry(5) {
-              --label \"org.opencontainers.image.title=Tvheadend\" \
+                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              --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} \
+              sh '''docker rmi \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+                    ${IMAGE}:arm64v8-${META_TAG} \
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''docker rmi \
-                  ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
           }
         }
       }
@@ -572,7 +397,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -580,7 +405,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -595,21 +420,12 @@ pipeline {
                   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'
-              elif [ "${DIST_IMAGE}" == "fedora" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  rpm -qa > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "arch" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  pacman -Q > /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
               fi
               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
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f j0nny
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -633,19 +449,12 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -654,7 +463,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -663,13 +472,6 @@ pipeline {
         }
       }
       steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -686,20 +488,20 @@ pipeline {
       }
       steps {
         withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key	', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
         ]) {
           script{
-            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
           }
           sh '''#! /bin/bash
                 set -e
-                docker pull ghcr.io/linuxserver/ci:latest
+                docker pull lsiodev/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
                 --shm-size=1gb \
@@ -711,15 +513,15 @@ pipeline {
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -e ACCESS_KEY=\"${DO_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 ghcr.io/linuxserver/ci:latest \
+                -t lsiodev/ci:latest \
                 python /ci/ci.py'''
         }
       }
@@ -740,46 +542,27 @@ 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 ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -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
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                  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}:j0nny
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    docker push ${PUSHIMAGE}:j0nny
-                    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}" "${QUAYIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:j0nny || :
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
                 done
              '''
         }
@@ -798,105 +581,73 @@ 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 ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -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 ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; 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}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-j0nny
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-j0nny
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-j0nny
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
-                    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}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${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-latest
+                    docker push ${MANIFESTIMAGE}:amd64-j0nny
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
+                    docker push ${MANIFESTIMAGE}:arm32v7-j0nny
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-j0nny
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker manifest push --purge ${MANIFESTIMAGE}:j0nny || :
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker manifest create ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:amd64-j0nny ${MANIFESTIMAGE}:arm32v7-j0nny ${MANIFESTIMAGE}:arm64v8-j0nny
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm32v7-j0nny --os linux --arch arm
-                    if [ -n "${SEMVER}" ]; then
+                    docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm64v8-j0nny --os linux --arch arm64 --variant v8
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm32v7-${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 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 annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
+                    docker manifest push --purge ${MANIFESTIMAGE}:j0nny
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
-                    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}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    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}:j0nny
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
+                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-j0nny
+                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-j0nny
+                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker push ${GITHUBIMAGE}:j0nny
+                  docker push ${GITHUBIMAGE}:${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-j0nny
+                  docker push ${GITHUBIMAGE}:arm64v8-j0nny
                '''
           }
           sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-j0nny \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-j0nny \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
+                  ${DELETEIMAGE}:arm64v8-j0nny || :
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
                 done
                 docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
              '''
         }
       }
@@ -904,7 +655,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "j0nny"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -912,20 +663,20 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Pushing New tag for current commit ${META_TAG}"
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${META_TAG}'",\
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to j0nny",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              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
+              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":"'${META_TAG}'",\
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "j0nny",\
-                     "name": "'${META_TAG}'",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\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'''
@@ -949,9 +700,9 @@ pipeline {
           sh '''#! /bin/bash
                 set -e
                 TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                docker pull 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 run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
-                docker pull ghcr.io/linuxserver/readme-sync
+                docker pull lsiodev/readme-sync
                 docker run --rm=true \
                   -e DOCKERHUB_USERNAME=$DOCKERUSER \
                   -e DOCKERHUB_PASSWORD=$DOCKERPASS \
@@ -959,7 +710,7 @@ pipeline {
                   -e DOCKER_REPOSITORY=${IMAGE} \
                   -e GIT_BRANCH=master \
                   -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+                  lsiodev/readme-sync bash -c 'node sync' 
                 rm -Rf ${TEMPDIR} '''
         }
       }

README.md

@@ -1,6 +1,3 @@
-<!-- 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!")
@@ -12,14 +9,13 @@
 
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
-* regular and timely application updates
+ * regular and timely application updates
-* easy user mappings (PGID, PUID)
+ * easy user mappings (PGID, PUID)
-* custom base image with s6 overlay
+ * 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
+ * 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 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.
@@ -29,46 +25,154 @@ 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)
+[![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)
+[![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")
 [![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/)
+[![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%2Fj0nny%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/j0nny/)
-[![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)
+[![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)
 
 [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
 
-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/).
+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/).
 
-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.
+Simply pulling `linuxserver/tvheadend` 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 | Available | Tag |
+| Architecture | Tag |
-| :----: | :----: | ---- |
+| :----: | --- |
-| x86-64 | ✅ | amd64-\<version tag\> |
+| x86-64 | amd64-latest |
-| arm64 | ✅ | arm64v8-\<version tag\> |
+| arm64 | arm64v8-latest |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| armhf | arm32v7-latest |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development 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 | Available | Description |
+| Tag | Description |
-| :----: | :----: |--- |
+| :----: | --- |
-| latest | ✅ | Current latest release. |
+| latest | Current latest release. |
-| release-4.2 | ✅ | Latest release from 4.2 branch. |
+| 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.
@@ -122,119 +226,19 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]
 
 **Picons**
 
-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.
+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.
 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=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
-```
-
-### 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=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 \
-  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=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:
-
-```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.")
 
-[![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) can be accessed via the dynamic badge above.
 
-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
 
@@ -243,7 +247,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" }}' lscr.io/linuxserver/tvheadend:latest`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/tvheadend`
 
 ## Updating Info
 
@@ -251,57 +255,48 @@ Most of our images are static, versioned, and require an image update and contai
 
 Below are the instructions for updating containers:
 
-### Via Docker Compose
+### 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 Docker Run
+### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
-
-* 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 lscr.io/linuxserver/tvheadend:latest .
+  -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
 ```
 
@@ -309,45 +304,4 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **16.04.22:** - Added URL XMLTV grabber.
+* **24.09.20:** - Initial j0nny Release.
-* **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.
-* **02.10.19:** - Improve permission fixing on render & dvb devices.
-* **18.08.19:** - Add AMD drivers.
-* **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
-* **28.06.19:** - Rebasing to alpine 3.10.
-* **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
-* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **01.03.19:** - Bump xmltv to 0.6.1.
-* **28.02.19:** - add perl-lwp-useragent-determined.
-* **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
-* **14.02.19:** - Add picons path to config.
-* **15.01.19:** - Add pipeline logic and multi arch.
-* **12.09.18:** - Rebase to alpine 3.8 and use buildstage type build.
-* **21.04.18:** - Add JSON::XS Perl package for grab_tv_huro.
-* **24.03.18:** - Add dvbcsa package.
-* **04.03.18:** - Use sourceforge master rather than mirror for xmltv.
-* **22.02.18:** - Add lost libva-intel-driver.
-* **21.02.18:** - Fix wrong version of iconv used.
-* **18.02.18:** - Add vaapi support, some cleanup and dropping of deprecated options.
-* **04.01.18:** - Deprecate cpu_core routine lack of scaling.
-* **11.12.17:** - Rebase to alpine 3.7, linting fixes.
-* **02.09.17:** - Add codec dependencies.
-* **13.07.17:** - Increase uniformity across all archs.
-* **08.07.17:** - Update README with full path for comskip.
-* **02.07.17:** - Move to one branch for all 4.2 releases.
-* **27.05.17:** - Rebase to alpine 3.6.
-* **01.05.17:** - Update to tvheadend 4.2.1 stable.
-* **18.04.17:** - Use repo version of gnu-libiconv rather than compiling.
-* **09.04.17:** - Chain cpanm installs in one block and use --installdeps.
-* **09.02.17:** - Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
-* **07.02.17:** - Add variable to add additional runtime paramters.
-* **05.02.17:** - Update to alpine 3.5 and change dvb-apps to only compile needed libs.
-* **14.11.16:** - Add picons from picons.xyz to /picons folder and add info to README.
-* **22.09.16:** - Fix broken tv_grab_wg, libs for xmltv and update README.
-* **18.09.16:** - Update XMLTV to 0.5.68 and update README.
-* **10.09.16:** - Add layer badges to README.
-* **05.09.16:** - Initial Release.

jenkins-vars.yml

@@ -4,8 +4,8 @@
 project_name: docker-tvheadend
 external_type: github_commit
 release_type: stable
-release_tag: latest
+release_tag: j0nny
-ls_branch: master
+ls_branch: j0nny
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'tvheadend'
@@ -17,8 +17,8 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
-  - DIST_IMAGE = 'alpine'
+  - DIST_IMAGE = 'ubuntu'
-  - MULTIARCH='true'
+  - MULTIARCH='false'
   - CI='true'
   - CI_WEB='true'
   - CI_PORT='9981'

package_versions.txt

@@ -1,261 +1,508 @@
-alpine-baselayout-3.2.0-r18
+adduser3.116ubuntu1
-alpine-keys-2.4-r1
+apt1.6.12ubuntu0.1
-alsa-lib-1.2.5.1-r1
+apt-utils1.6.12ubuntu0.1
-aom-libs-3.2.0-r0
+autotools-dev20180224.1
-apk-tools-2.12.7-r3
+base-files10.1ubuntu2.10
-bash-5.1.16-r0
+base-passwd3.5.44
-brotli-libs-1.0.9-r5
+bash4.4.18-2ubuntu1.2
-bsd-compat-headers-0.7.2-r3
+binutils-common2.30-21ubuntu1~18.04.4
-busybox-1.34.1-r5
+binutils-x86-64-linux-gnu2.30-21ubuntu1~18.04.4
-bzip2-1.0.8-r1
+bsdutils1:2.31.1-0.4ubuntu3.7
-ca-certificates-20211220-r0
+bzip21.0.6-8.1ubuntu0.2
-ca-certificates-bundle-20211220-r0
+ca-certificates20190110~18.04.1
-coreutils-9.0-r2
+cmake-data3.10.2-1ubuntu2.18.04.1
-curl-7.80.0-r1
+coreutils8.28-1ubuntu1
-expat-2.4.7-r0
+cpp4:7.4.0-1ubuntu2.3
-ffmpeg-4.4.1-r2
+cpp-77.5.0-3ubuntu1~18.04
-ffmpeg-libs-4.4.1-r2
+curl7.58.0-2ubuntu3.10
-fontconfig-2.13.1-r4
+dash0.5.8-2.10
-freetype-2.11.1-r2
+debconf1.5.66ubuntu1
-fribidi-1.0.11-r0
+debianutils4.8.4
-fts-1.2.7-r1
+diffutils1:3.6-1
-gdbm-1.22-r0
+dpkg1.19.0.5ubuntu2.3
-glib-2.70.1-r0
+dtv-scan-tables0+git20171226.07b18ec-1
-gmp-6.2.1-r1
+dvb-apps1.1.1+rev1500-1.2
-gnu-libiconv-1.16-r0
+e2fsprogs1.44.1-1ubuntu1.3
-gnutls-3.7.1-r0
+fdisk2.31.1-0.4ubuntu3.7
-graphite2-1.3.14-r0
+file1:5.32-2ubuntu0.4
-gzip-1.12-r0
+findutils4.6.0+git+20170828-2
-harfbuzz-3.0.0-r2
+fontconfig2.12.6-0ubuntu2
-intel-gmmlib-21.3.3-r0
+fontconfig-config2.12.6-0ubuntu2
-intel-media-driver-21.4.1-r0
+fonts-dejavu-core2.37-1
-lame-3.100-r0
+gcc-7-base7.5.0-3ubuntu1~18.04
-less-590-r0
+gcc-8-base8.4.0-1ubuntu1~18.04
-libacl-2.2.53-r0
+gettext-base0.19.8.1-6ubuntu0.3
-libass-0.15.2-r0
+git-man1:2.17.1-1ubuntu0.7
-libattr-2.5.1-r1
+gpgv2.2.4-1ubuntu1.3
-libblkid-2.37.4-r0
+grep3.1-2build1
-libbsd-0.11.3-r1
+gzip1.6-5ubuntu1
-libbz2-1.0.8-r1
+hostname3.20
-libc-utils-0.7.2-r3
+init-system-helpers1.51
-libcrypto1.1-1.1.1o-r0
+jq1.5+dfsg-2
-libcurl-7.80.0-r1
+krb5-locales1.16-2ubuntu0.1
-libdav1d-0.9.2-r0
+libacl12.2.52-3build1
-libdrm-2.4.109-r0
+libalgorithm-c3-perl0.10-1
-libdvbcsa-1.1.0-r1
+libapt-inst2.01.6.12ubuntu0.1
-libelf-0.185-r0
+libapt-pkg5.01.6.12ubuntu0.1
-libffi-3.4.2-r1
+libarchive133.2.2-3.1ubuntu0.6
-libgcc-10.3.1_git20211027-r0
+libarchive-zip-perl1.60-1ubuntu0.1
-libgcrypt-1.9.4-r0
+libargtable2-013-1
-libgomp-10.3.1_git20211027-r0
+libargtable2-docs13-1
-libgpg-error-1.42-r1
+libasan47.5.0-3ubuntu1~18.04
-libhdhomerun-libs-20200225-r0
+libasn1-8-heimdal7.5.0+dfsg-1
-libidn2-2.3.2-r0
+libasound21.1.3-5ubuntu0.5
-libintl-0.21-r0
+libasound2-data1.1.3-5ubuntu0.5
-libjpeg-turbo-2.1.2-r0
+libasound2-dev1.1.3-5ubuntu0.5
-libmd-1.0.3-r0
+libasyncns00.8-6
-libmount-2.37.4-r0
+libatomic18.4.0-1ubuntu1~18.04
-libogg-1.3.5-r0
+libattr11:2.4.47-2build1
-libpciaccess-0.16-r0
+libaudit11:2.8.2-1ubuntu1
-libpng-1.6.37-r1
+libaudit-common1:2.8.2-1ubuntu1
-libproc-3.3.17-r0
+libavahi-client30.7-3.1ubuntu1.2
-libretls-3.3.4-r3
+libavahi-common30.7-3.1ubuntu1.2
-libsrt-1.4.2-r1
+libavahi-common-data0.7-3.1ubuntu1.2
-libssh-0.9.6-r1
+libavahi-common-dev0.7-3.1ubuntu1.2
-libssl1.1-1.1.1o-r0
+libavutil557:3.4.8-0ubuntu0.2
-libstdc++-10.3.1_git20211027-r0
+libavutil-dev7:3.4.8-0ubuntu0.2
-libtasn1-4.18.0-r0
+libb-hooks-endofscope-perl0.21-1
-libtheora-1.1.1-r16
+libb-hooks-op-check-perl0.22-1
-libunistring-0.9.10-r1
+libbinutils2.30-21ubuntu1~18.04.4
-liburiparser-0.9.6-r0
+libblkid12.31.1-0.4ubuntu3.7
-libuuid-2.37.4-r0
+libbluray21:1.0.2-3
-libva-2.13.0-r0
+libbsd00.8.7-1ubuntu0.1
-libva-intel-driver-2.4.1-r0
+libbz2-1.01.0.6-8.1ubuntu0.2
-libvdpau-1.4-r0
+libc62.27-3ubuntu1.2
-libvorbis-1.3.7-r0
+libc6-dev2.27-3ubuntu1.2
-libvpx-1.10.0-r0
+libcaca00.99.beta19-2ubuntu0.18.04.1
-libwebp-1.2.2-r0
+libcairo21.15.10-2ubuntu0.1
-libx11-1.7.2-r0
+libcap-ng00.7.7-3.1
-libxau-1.0.9-r0
+libc-bin2.27-3ubuntu1.2
-libxcb-1.14-r2
+libcc1-08.4.0-1ubuntu1~18.04
-libxdmcp-1.1.3-r0
+libc-dev-bin2.27-3ubuntu1.2
-libxext-1.3.4-r0
+libcgi-pm-perl4.38-1
-libxfixes-6.0.0-r0
+libcilkrts57.5.0-3ubuntu1~18.04
-libxml2-2.9.14-r0
+libclass-c3-perl0.33-1
-libxshmfence-1.3-r1
+libclass-data-inheritable-perl0.08-2
-libxslt-1.1.35-r0
+libclass-factory-util-perl1.7-3
-linux-headers-5.10.41-r0
+libclass-inspector-perl1.32-1
-linux-pam-1.5.2-r0
+libclass-method-modifiers-perl2.12-1
-llvm12-libs-12.0.1-r0
+libclass-singleton-perl1.5-1
-mesa-21.2.6-r0
+libcom-err21.44.1-1ubuntu1.3
-mesa-dri-ati-21.2.6-r0
+libconvert-binhex-perl1.125-1
-mesa-dri-classic-21.2.6-r0
+libcroco30.6.12-2
-mesa-dri-gallium-21.2.6-r0
+libcrystalhd31:0.0~git20110715.fdd2f19-12
-mesa-glapi-21.2.6-r0
+libcurl3-gnutls7.58.0-2ubuntu3.10
-mesa-va-gallium-21.2.6-r0
+libcurl47.58.0-2ubuntu3.10
-mesa-vdpau-gallium-21.2.6-r0
+libdata-dump-perl1.23-1
-mpdecimal-2.5.1-r1
+libdata-optlist-perl0.110-1
-musl-1.2.2-r7
+libdate-manip-perl6.60-1
-musl-utils-1.2.2-r7
+libdatetime-format-builder-perl0.8100-1
-ncurses-libs-6.3_p20211120-r0
+libdatetime-format-iso8601-perl0.08-2
-ncurses-terminfo-base-6.3_p20211120-r0
+libdatetime-format-sqlite-perl0.11-2
-nettle-3.7.3-r0
+libdatetime-format-strptime-perl1.7500-1
-nghttp2-libs-1.46.0-r0
+libdatetime-locale-perl1:1.17-1
-openssl-1.1.1o-r0
+libdatetime-perl2:1.46-1
-opus-1.3.1-r1
+libdatetime-timezone-perl1:2.18-1+2018d
-p11-kit-0.24.0-r1
+libdatrie10.2.10-7
-pcre-8.45-r1
+libdb5.35.3.28-13.1ubuntu1.1
-pcre2-10.40-r0
+libdbd-sqlite3-perl1.56-1
-perl-5.34.0-r1
+libdbi-perl1.640-1ubuntu0.2
-perl-archive-zip-1.68-r1
+libdbus-1-31.12.2-1ubuntu1.2
-perl-b-hooks-endofscope-0.25-r0
+libdca00.0.5-10
-perl-boolean-0.46-r2
+libdebconfclient00.213ubuntu1
-perl-capture-tiny-0.48-r2
+libdevel-callchecker-perl0.007-2build1
-perl-cgi-4.53-r0
+libdevel-stacktrace-perl2.0300-1
-perl-class-data-inheritable-0.09-r0
+libdpkg-perl1.19.0.5ubuntu2.3
-perl-class-inspector-1.36-r2
+libdrm22.4.101-2~18.04.1
-perl-class-methodmaker-2.24-r8
+libdrm-amdgpu12.4.101-2~18.04.1
-perl-class-singleton-1.6-r0
+libdrm-common2.4.101-2~18.04.1
-perl-common-sense-3.75-r2
+libdrm-dev2.4.101-2~18.04.1
-perl-compress-raw-zlib-2.101-r1
+libdrm-intel12.4.101-2~18.04.1
-perl-cpan-meta-check-0.014-r2
+libdrm-nouveau22.4.101-2~18.04.1
-perl-date-manip-6.86-r0
+libdrm-radeon12.4.101-2~18.04.1
-perl-datetime-1.54-r1
+libdvbcsa11.1.0-2
-perl-datetime-format-strptime-1.79-r0
+libdvbcsa-dev1.1.0-2
-perl-datetime-locale-1.33-r0
+libdynaloader-functions-perl0.003-1
-perl-datetime-timezone-2.51-r0
+libedit23.1-20170329-1
-perl-dbd-sqlite-1.70-r1
+libegl11.0.0-2ubuntu2.3
-perl-dbi-1.643-r3
+libegl-mesa020.0.8-0ubuntu1~18.04.1
-perl-devel-stacktrace-2.04-r3
+libelf10.170-0.4ubuntu0.1
-perl-devel-symdump-2.18-r2
+libencode-locale-perl1.05-1
-perl-digest-sha1-2.13-r14
+liberror-perl0.17025-1
-perl-dist-checkconflicts-0.11-r2
+libeval-closure-perl0.14-1
-perl-doc-5.34.0-r1
+libexception-class-perl1.44-1
-perl-encode-locale-1.05-r3
+libexpat12.2.5-3ubuntu0.2
-perl-eval-closure-0.14-r2
+libexporter-tiny-perl1.000000-2
-perl-exception-class-1.45-r0
+libext2fs21.44.1-1ubuntu1.3
-perl-exporter-tiny-1.002002-r1
+libfaac01.29.7.7-1
-perl-file-listing-6.14-r0
+libfcgi-perl0.78-2build1
-perl-file-sharedir-1.118-r0
+libfdisk12.31.1-0.4ubuntu3.7
-perl-file-sharedir-install-0.13-r2
+libfdk-aac10.1.5-1
-perl-file-slurp-9999.32-r1
+libffi63.2.1-8
-perl-file-temp-0.2311-r0
+libfile-chdir-perl0.1008-1
-perl-file-which-1.27-r0
+libfile-homedir-perl1.002-1
-perl-getopt-long-2.52-r1
+libfile-listing-perl6.04-1
-perl-html-parser-3.76-r1
+libfile-sharedir-perl1.104-1
-perl-html-tagset-3.20-r3
+libfile-slurp-perl9999.19-6
-perl-html-tree-5.07-r2
+libfile-which-perl1.21-1
-perl-http-cookies-6.10-r0
+libflac81.3.2-1
-perl-http-daemon-6.12-r1
+libfontconfig12.12.6-0ubuntu2
-perl-http-date-6.05-r1
+libfreetype62.8.1-2ubuntu2
-perl-http-message-6.35-r0
+libfribidi00.19.7-2
-perl-http-negotiate-6.01-r3
+libgbm120.0.8-0ubuntu1~18.04.1
-perl-importer-0.026-r1
+libgcc11:8.4.0-1ubuntu1~18.04
-perl-io-1.48-r0
+libgcc-7-dev7.5.0-3ubuntu1~18.04
-perl-io-html-1.004-r0
+libgcrypt201.8.1-4ubuntu1.2
-perl-io-socket-ssl-2.072-r0
+libgdbm51.14.1-6
-perl-io-stringy-2.113-r1
+libgdbm-compat41.14.1-6
-perl-ipc-run3-0.048-r2
+libgdk-pixbuf2.0-02.36.11-2
-perl-json-4.03-r1
+libgdk-pixbuf2.0-common2.36.11-2
-perl-json-xs-4.03-r1
+libgl11.0.0-2ubuntu2.3
-perl-libwww-6.58-r0
+libgl1-mesa-dev20.0.8-0ubuntu1~18.04.1
-perl-lingua-en-numbers-ordinate-1.05-r0
+libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1
-perl-lingua-preferred-0.2.4-r4
+libglapi-mesa20.0.8-0ubuntu1~18.04.1
-perl-list-moreutils-0.430-r0
+libgles11.0.0-2ubuntu2.3
-perl-list-moreutils-xs-0.430-r1
+libgles21.0.0-2ubuntu2.3
-perl-lwp-mediatypes-6.04-r1
+libglib2.0-02.56.4-0ubuntu0.18.04.6
-perl-lwp-useragent-determined-1.07-r2
+libglib2.0-bin2.56.4-0ubuntu0.18.04.6
-perl-module-build-0.4231-r1
+libglib2.0-data2.56.4-0ubuntu0.18.04.6
-perl-module-implementation-0.09-r3
+libglu1-mesa9.0.0-2.1build1
-perl-module-metadata-1.000037-r1
+libglu1-mesa-dev9.0.0-2.1build1
-perl-module-pluggable-5.2-r2
+libglvnd01.0.0-2ubuntu2.3
-perl-module-runtime-0.016-r4
+libglvnd-core-dev1.0.0-2ubuntu2.3
-perl-mozilla-ca-20211001-r0
+libglvnd-dev1.0.0-2ubuntu2.3
-perl-mro-compat-0.13-r2
+libglx01.0.0-2ubuntu2.3
-perl-namespace-autoclean-0.29-r2
+libglx-mesa020.0.8-0ubuntu1~18.04.1
-perl-namespace-clean-0.27-r2
+libgme00.6.2-1
-perl-net-http-6.21-r0
+libgmp102:6.1.2+dfsg-2
-perl-net-ssleay-1.90-r3
+libgnutls303.5.18-1ubuntu1.4
-perl-package-deprecationmanager-0.17-r2
+libgomp18.4.0-1ubuntu1~18.04
-perl-package-stash-0.39-r0
+libgpg-error01.27-6
-perl-params-util-1.102-r1
+libgraphite2-31.3.11-2
-perl-params-validate-1.30-r1
+libgsm11.0.13-4build1
-perl-params-validationcompiler-0.30-r1
+libgssapi3-heimdal7.5.0+dfsg-1
-perl-parse-recdescent-1.967015-r3
+libgssapi-krb5-21.16-2ubuntu0.1
-perl-path-class-0.37-r2
+libharfbuzz0b1.7.2-1ubuntu1
-perl-pod-coverage-0.23-r2
+libhcrypto4-heimdal7.5.0+dfsg-1
-perl-pod-parser-1.63-r1
+libhdhomerun420180327-1
-perl-role-tiny-2.002004-r1
+libheimbase1-heimdal7.5.0+dfsg-1
-perl-scalar-list-utils-1.60-r0
+libheimntlm0-heimdal7.5.0+dfsg-1
-perl-scope-guard-0.21-r2
+libhogweed43.4-1
-perl-specio-0.47-r0
+libhtml-form-perl6.03-1
-perl-sub-exporter-progressive-0.001013-r2
+libhtml-parser-perl3.72-3build1
-perl-sub-identify-0.14-r6
+libhtml-tableextract-perl2.15-1
-perl-sub-info-0.002-r2
+libhtml-tagset-perl3.20-3
-perl-sub-install-0.928-r2
+libhtml-tree-perl5.07-1
-perl-sub-name-0.26-r3
+libhttp-cache-transparent-perl1.1-1
-perl-sub-quote-2.006006-r1
+libhttp-cookies-perl6.04-1
-perl-sub-uplevel-0.2800-r2
+libhttp-daemon-perl6.01-1
-perl-term-progressbar-2.22-r2
+libhttp-date-perl6.02-1
-perl-term-readkey-2.38-r6
+libhttp-message-perl6.14-1
-perl-term-table-0.015-r1
+libhttp-negotiate-perl6.00-2
-perl-test-exception-0.43-r2
+libhttp-server-simple-perl0.52-1
-perl-test-fatal-0.016-r3
+libhx509-5-heimdal7.5.0+dfsg-1
-perl-test-pod-1.52-r2
+libiconv-hook10.0.20021209-11
-perl-test-requires-0.11-r1
+libicu6060.2-3ubuntu3.1
-perl-test-simple-1.302188-r1
+libidn2-02.0.4-1.1ubuntu0.2
-perl-test-taint-1.08-r4
+libio-html-perl1.001-1
-perl-test-warnings-0.031-r0
+libio-sessiondata-perl1.03-1
-perl-test-without-module-0.20-r2
+libio-socket-ssl-perl2.060-3~ubuntu18.04.1
-perl-test2-plugin-nowarnings-0.09-r1
+libio-stringy-perl2.111-2
-perl-test2-suite-0.000142-r0
+libisl190.19-1
-perl-timedate-2.33-r1
+libitm18.4.0-1ubuntu1~18.04
-perl-try-tiny-0.30-r3
+libjbig02.1-3.1build1
-perl-types-serialiser-1.01-r0
+libjpeg88c-2ubuntu8
-perl-unicode-string-2.10-r3
+libjpeg-turbo81.5.2-0ubuntu5.18.04.4
-perl-uri-5.10-r0
+libjq11.5+dfsg-2
-perl-variable-magic-0.62-r5
+libjsoncpp11.7.4-3
-perl-www-robotrules-6.02-r3
+libjson-perl2.97001-1
-perl-xml-libxml-2.0207-r1
+libk5crypto31.16-2ubuntu0.1
-perl-xml-libxslt-1.99-r2
+libkeyutils11.5.9-9.2ubuntu2
-perl-xml-namespacesupport-1.12-r3
+libkrb5-26-heimdal7.5.0+dfsg-1
-perl-xml-parser-2.46-r2
+libkrb5-31.16-2ubuntu0.1
-perl-xml-sax-1.02-r1
+libkrb5support01.16-2ubuntu0.1
-perl-xml-sax-base-1.09-r3
+libldap-2.4-22.4.45+dfsg-1ubuntu1.6
-perl-xml-treepp-0.43-r3
+libldap-common2.4.45+dfsg-1ubuntu1.6
-perl-xml-twig-3.52-r3
+liblist-moreutils-perl0.416-1build3
-perl-xml-writer-0.900-r0
+libllvm101:10.0.0-4ubuntu1~18.04.2
-procps-3.3.17-r0
+liblsan08.4.0-1ubuntu1~18.04
-py3-certifi-2020.12.5-r1
+liblwp-mediatypes-perl6.02-1
-py3-charset-normalizer-2.0.7-r0
+liblwp-protocol-https-perl6.07-2
-py3-idna-3.3-r0
+liblwp-useragent-determined-perl1.07-1
-py3-requests-2.26.0-r1
+liblz4-10.0~r131-2ubuntu3
-py3-urllib3-1.26.7-r0
+liblzma55.2.2-1.3
-python3-3.9.7-r4
+liblzo2-22.08-1.2
-readline-8.1.1-r0
+libmagic11:5.32-2ubuntu0.4
-s6-ipcserver-2.11.0.0-r0
+libmagic-mgc1:5.32-2ubuntu0.4
-scanelf-1.3.3-r0
+libmailtools-perl2.18-1
-sdl2-2.0.16-r4
+libmime-tools-perl5.509-1
-shadow-4.8.1-r1
+libmodule-implementation-perl0.09-1
-skalibs-2.11.0.0-r0
+libmodule-runtime-perl0.016-1
-soxr-0.1.3-r2
+libmount12.31.1-0.4ubuntu3.7
-sqlite-libs-3.36.0-r0
+libmp3lame03.100-2
-ssl_client-1.34.1-r5
+libmpc31.1.0-1
-tar-1.34-r0
+libmpdec22.4.2-1ubuntu1
-tzdata-2022a-r0
+libmpfr64.0.1-1
-uriparser-0.9.6-r0
+libmpg123-01.25.10-1
-utmps-0.1.0.3-r0
+libmpx28.4.0-1ubuntu1~18.04
-v4l-utils-libs-1.22.1-r1
+libmro-compat-perl0.13-1
-vidstab-1.1.0-r1
+libnamespace-autoclean-perl0.28-1
-vulkan-loader-1.2.196-r0
+libnamespace-clean-perl0.27-1
-wayland-libs-client-1.19.0-r1
+libncurses56.1-1ubuntu1.18.04
-wget-1.21.2-r2
+libncursesw56.1-1ubuntu1.18.04
-x264-20210613-r0
+libnet-http-perl6.17-1
-x264-libs-20210613-r0
+libnet-smtp-ssl-perl1.04-1
-x265-3.5-r0
+libnet-ssleay-perl1.84-1ubuntu0.2
-x265-libs-3.5-r0
+libnettle63.4-1
-xvidcore-1.3.7-r1
+libnghttp2-141.30.0-1ubuntu1
-xz-5.2.5-r1
+libnuma12.0.11-2.1ubuntu0.1
-xz-libs-5.2.5-r1
+libogg01.3.2-1
-zlib-1.2.12-r1
+libogg-dev1.3.2-1
-zstd-libs-1.5.0-r0
+libonig46.7.0-1
+libopencore-amrnb00.1.3-2.1
+libopencore-amrwb00.1.3-2.1
+libopengl01.0.0-2ubuntu2.3
+libopenjp2-72.3.0-2build0.18.04.1
+libopenmpt00.3.6-1
+libopus01.1.2-1ubuntu1
+libossp-uuid161.6.2-1.5build4
+libossp-uuid-perl1.6.2-1.5build4
+libp11-kit00.23.9-2
+libpackage-deprecationmanager-perl0.17-1
+libpackage-stash-perl0.37-1
+libpam0g1.1.8-3.6ubuntu2.18.04.2
+libpam-modules1.1.8-3.6ubuntu2.18.04.2
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
+libpam-runtime1.1.8-3.6ubuntu2.18.04.2
+libpango-1.0-01.40.14-1ubuntu0.1
+libpangocairo-1.0-01.40.14-1ubuntu0.1
+libpangoft2-1.0-01.40.14-1ubuntu0.1
+libparams-classify-perl0.015-1
+libparams-util-perl1.07-3build3
+libparams-validate-perl1.29-1
+libparams-validationcompiler-perl0.26-1
+libparse-recdescent-perl1.967015+dfsg-2
+libpciaccess00.14-1
+libpcre16-32:8.39-9
+libpcre32-32:8.39-9
+libpcre32:8.39-9
+libpcre3-dev2:8.39-9
+libpcrecpp0v52:8.39-9
+libperl5.265.26.1-6ubuntu0.3
+libpixman-1-00.34.0-2
+libpng16-161.6.34-1ubuntu0.18.04.2
+libprocps62:3.3.12-3ubuntu1.2
+libpsl50.19.1-5build1
+libpthread-stubs0-dev0.3-4
+libpython2.7-minimal2.7.17-1~18.04ubuntu1.1
+libpython2.7-stdlib2.7.17-1~18.04ubuntu1.1
+libpython3.6-minimal3.6.9-1~18.04ubuntu1.1
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1.1
+libpython3-stdlib3.6.7-1~18.04
+libpython-stdlib2.7.15~rc1-1
+libquadmath08.4.0-1ubuntu1~18.04
+libreadline77.0-3
+librhash01.3.6-2
+libroken18-heimdal7.5.0+dfsg-1
+librole-tiny-perl2.000006-1
+librsvg2-22.40.20-2ubuntu0.2
+librtmp12.4+20151223.gitfa8646d.1-1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libseccomp22.4.3-1ubuntu3.18.04.3
+libselinux12.7-2build2
+libsemanage12.7-2build2
+libsemanage-common2.7-2build2
+libsensors41:3.4.0-4
+libsepol12.7-1
+libset-scalar-perl1.29-2
+libshine33.1.1-1
+libsigsegv22.12-1
+libslang22.3.1a-3ubuntu1
+libsmartcols12.31.1-0.4ubuntu3.7
+libsnappy1v51.1.7-1
+libsoap-lite-perl1.26-1
+libsoxr00.1.2-3
+libsoxr-lsr00.1.2-3
+libspecio-perl0.42-1
+libspeex11.2~rc1.2-1ubuntu2
+libsqlite3-03.22.0-1ubuntu0.4
+libss21.44.1-1ubuntu1.3
+libssh-gcrypt-40.8.0~20170825.94fa1e38-1ubuntu0.7
+libssl1.0.01.0.2n-1ubuntu5.4
+libssl1.11.1.1-1ubuntu2.1~18.04.6
+libstdc++68.4.0-1ubuntu1~18.04
+libstdc++-7-dev7.5.0-3ubuntu1~18.04
+libsub-exporter-perl0.987-1
+libsub-exporter-progressive-perl0.001013-1
+libsub-identify-perl0.14-1
+libsub-install-perl0.928-1
+libsub-name-perl0.21-1build1
+libsub-quote-perl2.005000-1
+libswresample27:3.4.8-0ubuntu0.2
+libswresample-dev7:3.4.8-0ubuntu0.2
+libsystemd0237-3ubuntu10.42
+libtask-weaken-perl1.05-1
+libtasn1-64.13-2
+libterm-readkey-perl2.37-1build1
+libtext-bidi-perl2.12-1build1
+libtext-iconv-perl1.7-5build6
+libthai00.1.27-2
+libthai-data0.1.27-2
+libtheora01.1.1+dfsg.1-14
+libtiff54.0.9-5ubuntu0.3
+libtimedate-perl2.3000-2
+libtinfo56.1-1ubuntu1.18.04
+libtk-tablematrix-perl1.23-6.1build4
+libtry-tiny-perl0.30-1
+libtsan08.4.0-1ubuntu1~18.04
+libtwolame00.3.13-3
+libubsan07.5.0-3ubuntu1~18.04
+libudev1237-3ubuntu10.42
+libunistring20.9.9-0ubuntu2
+liburi-perl1.73-1
+libuuid12.31.1-0.4ubuntu3.7
+libuv11.18.0-3
+libva22.1.0-3
+libva-drm22.1.0-3
+libva-glx22.1.0-3
+libvariable-magic-perl0.62-1
+libva-wayland22.1.0-3
+libva-x11-22.1.0-3
+libvdpau11.1.1-3ubuntu1
+libvo-aacenc00.1.3-1
+libvorbis0a1.3.5-4.2
+libvorbisfile31.3.5-4.2
+libvpx51.7.0-3ubuntu0.18.04.1
+libwavpack15.1.0-2ubuntu1.4
+libwayland-bin1.16.0-1ubuntu1.1~18.04.3
+libwayland-client01.16.0-1ubuntu1.1~18.04.3
+libwayland-cursor01.16.0-1ubuntu1.1~18.04.3
+libwayland-dev1.16.0-1ubuntu1.1~18.04.3
+libwayland-egl11.16.0-1ubuntu1.1~18.04.3
+libwayland-server01.16.0-1ubuntu1.1~18.04.3
+libwebp60.6.1-2
+libwebpmux30.6.1-2
+libwind0-heimdal7.5.0+dfsg-1
+libwrap07.6.q-27
+libwww-mechanize-perl1.86-1
+libwww-perl6.31-1ubuntu0.1
+libwww-robotrules-perl6.01-1
+libx11-62:1.6.4-3ubuntu0.3
+libx11-data2:1.6.4-3ubuntu0.3
+libx11-dev2:1.6.4-3ubuntu0.3
+libx11-xcb12:1.6.4-3ubuntu0.3
+libx11-xcb-dev2:1.6.4-3ubuntu0.3
+libx264-1522:0.152.2854+gite9a5903-2
+libx265-1462.6-3
+libxau61:1.0.8-1ubuntu1
+libxau-dev1:1.0.8-1ubuntu1
+libxcb11.13-2~ubuntu18.04
+libxcb1-dev1.13-2~ubuntu18.04
+libxcb-dri2-01.13-2~ubuntu18.04
+libxcb-dri2-0-dev1.13-2~ubuntu18.04
+libxcb-dri3-01.13-2~ubuntu18.04
+libxcb-dri3-dev1.13-2~ubuntu18.04
+libxcb-glx01.13-2~ubuntu18.04
+libxcb-glx0-dev1.13-2~ubuntu18.04
+libxcb-present01.13-2~ubuntu18.04
+libxcb-present-dev1.13-2~ubuntu18.04
+libxcb-randr01.13-2~ubuntu18.04
+libxcb-randr0-dev1.13-2~ubuntu18.04
+libxcb-render01.13-2~ubuntu18.04
+libxcb-render0-dev1.13-2~ubuntu18.04
+libxcb-shape01.13-2~ubuntu18.04
+libxcb-shape0-dev1.13-2~ubuntu18.04
+libxcb-shm01.13-2~ubuntu18.04
+libxcb-sync11.13-2~ubuntu18.04
+libxcb-sync-dev1.13-2~ubuntu18.04
+libxcb-xfixes01.13-2~ubuntu18.04
+libxcb-xfixes0-dev1.13-2~ubuntu18.04
+libxdamage11:1.1.4-3
+libxdamage-dev1:1.1.4-3
+libxdmcp61:1.1.2-3
+libxdmcp-dev1:1.1.2-3
+libxext62:1.3.3-1
+libxext-dev2:1.3.3-1
+libxfixes31:5.0.3-1
+libxfixes-dev1:5.0.3-1
+libxft22.3.2-1
+libxml22.9.4+dfsg1-6.1ubuntu1.3
+libxml-dom-perl1.44-2
+libxml-libxml-perl2.0128+dfsg-5
+libxml-libxslt-perl1.95-1build2
+libxml-namespacesupport-perl1.12-1
+libxml-parser-perl2.44-2build3
+libxml-perl0.08-2
+libxml-regexp-perl0.04-1
+libxml-sax-base-perl1.09-1
+libxml-sax-perl0.99+dfsg-2ubuntu1
+libxml-treepp-perl0.43-1
+libxmltv-perl0.5.70-1
+libxml-twig-perl1:3.50-1
+libxml-writer-perl0.625-1
+libxrender11:0.9.10-1
+libxshmfence11.3-1
+libxshmfence-dev1.3-1
+libxslt1.11.1.29-5ubuntu0.2
+libxvidcore42:1.3.5-1
+libxxf86vm11:1.1.4-1
+libxxf86vm-dev1:1.1.4-1
+libzstd11.3.3+dfsg-2ubuntu1.1
+libzvbi00.2.35-13
+libzvbi-common0.2.35-13
+linux-libc-dev4.15.0-118.119
+locales2.27-3ubuntu1.2
+login1:4.5-1ubuntu2
+lsb-base9.20170808ubuntu1
+m41.4.18-1
+make4.1-9.1ubuntu1
+makedev2.3.1-93ubuntu2
+mawk1.3.3-17ubuntu3
+mesa-common-dev20.0.8-0ubuntu1~18.04.1
+mime-support3.60ubuntu1
+mount2.31.1-0.4ubuntu3.7
+multiarch-support2.27-3ubuntu1.2
+ncurses-base6.1-1ubuntu1.18.04
+ncurses-bin6.1-1ubuntu1.18.04
+netbase5.4
+openssl1.1.1-1ubuntu2.1~18.04.6
+passwd1:4.5-1ubuntu2
+patch2.7.6-2ubuntu1.1
+perl5.26.1-6ubuntu0.3
+perl-base5.26.1-6ubuntu0.3
+perl-modules-5.265.26.1-6ubuntu0.3
+perl-openssl-defaults3build1
+perl-tk1:804.033-2build1
+procps2:3.3.12-3ubuntu1.2
+publicsuffix20180223.1310-1
+python2.72.7.17-1~18.04ubuntu1.1
+python2.7-minimal2.7.17-1~18.04ubuntu1.1
+python3.63.6.9-1~18.04ubuntu1.1
+python3.6-minimal3.6.9-1~18.04ubuntu1.1
+python3-minimal3.6.7-1~18.04
+python-minimal2.7.15~rc1-1
+readline-common7.0-3
+sed4.4-2
+sensible-utils0.0.12
+shared-mime-info1.9-2
+sysvinit-utils2.88dsf-59.10ubuntu1
+tar1.29b-2ubuntu0.1
+tzdata2020a-0ubuntu0.18.04
+ubuntu-keyring2018.09.18.1~18.04.0
+ucf3.0038
+util-linux2.31.1-0.4ubuntu3.7
+x11proto-core-dev2018.4-4
+x11proto-damage-dev1:2018.4-4
+x11proto-dev2018.4-4
+x11proto-fixes-dev1:2018.4-4
+x11proto-xext-dev2018.4-4
+x11proto-xf86vidmode-dev2018.4-4
+xmltv0.5.70-1
+xmltv-gui0.5.70-1
+xmltv-util0.5.70-1
+xorg-sgml-doctools1:1.11-1
+xtrans-dev1.3.5-1
+xz-utils5.2.2-1.3
+zlib1g1:1.2.11.dfsg-0ubuntu2

patches/cpanfile

@@ -1,7 +1,6 @@
 requires 'perl' => '5.24.0';
 
 # perl packages for tvheadend x86
-requires 'Data::Dump' ;
 requires 'DateTime::Format::ISO8601' ;
 requires 'DateTime::Format::SQLite' ;
 requires 'Encode' ;

patches/test_tv_imdb.t.patch

@@ -0,0 +1,20 @@
+---
+ 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

@@ -23,6 +23,8 @@ development_versions: true
 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
@@ -59,7 +61,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 macvlan.
+    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.
 
 # application setup block
 app_setup_block_enabled: true
@@ -115,7 +117,7 @@ app_setup_block: |
 
   **Picons**
 
-  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.
+  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.
   You need to enable minimum advanced view level to see the picons options.
 
   ## Additional runtime parameters
@@ -124,45 +126,4 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "16.04.22:", desc: "Added URL XMLTV grabber." }
+  - { date: "24.09.20:", desc: "Initial j0nny Release." }
-  - { 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." }
-  - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
-  - { date: "18.08.19:", desc: "Add AMD drivers." }
-  - { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
-  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
-  - { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
-  - { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
-  - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
-  - { date: "14.02.19:", desc: "Add picons path to config." }
-  - { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }
-  - { date: "12.09.18:", desc: "Rebase to alpine 3.8 and use buildstage type build." }
-  - { date: "21.04.18:", desc: "Add JSON::XS Perl package for grab_tv_huro." }
-  - { date: "24.03.18:", desc: "Add dvbcsa package." }
-  - { date: "04.03.18:", desc: "Use sourceforge master rather than mirror for xmltv." }
-  - { date: "22.02.18:", desc: "Add lost libva-intel-driver." }
-  - { date: "21.02.18:", desc: "Fix wrong version of iconv used." }
-  - { date: "18.02.18:", desc: "Add vaapi support, some cleanup and dropping of deprecated options." }
-  - { date: "04.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
-  - { date: "11.12.17:", desc: "Rebase to alpine 3.7, linting fixes." }
-  - { date: "02.09.17:", desc: "Add codec dependencies." }
-  - { date: "13.07.17:", desc: "Increase uniformity across all archs." }
-  - { date: "08.07.17:", desc: "Update README with full path for comskip." }
-  - { date: "02.07.17:", desc: "Move to one branch for all 4.2 releases." }
-  - { date: "27.05.17:", desc: "Rebase to alpine 3.6." }
-  - { date: "01.05.17:", desc: "Update to tvheadend 4.2.1 stable." }
-  - { date: "18.04.17:", desc: "Use repo version of gnu-libiconv rather than compiling." }
-  - { date: "09.04.17:", desc: "Chain cpanm installs in one block and use --installdeps." }
-  - { date: "09.02.17:", desc: "Perl changes, add picons file to gitignore and update XMLTV to 0.5.69." }
-  - { date: "07.02.17:", desc: "Add variable to add additional runtime paramters." }
-  - { date: "05.02.17:", desc: "Update to alpine 3.5 and change dvb-apps to only compile needed libs." }
-  - { date: "14.11.16:", desc: "Add picons from picons.xyz to /picons folder and add info to README." }
-  - { date: "22.09.16:", desc: "Fix broken tv_grab_wg, libs for xmltv and update README." }
-  - { date: "18.09.16:", desc: "Update XMLTV to 0.5.68 and update README." }
-  - { date: "10.09.16:", desc: "Add layer badges to README." }
-  - { date: "05.09.16:", desc: "Initial Release." }

root/etc/services.d/tvheadend/run

@@ -3,4 +3,4 @@
 IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
 
 exec \
-        s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"
+        s6-setuidgid abc /usr/local/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"

root/usr/bin/tv_grab_url

@@ -1,67 +0,0 @@
-#!/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