Bot Updating Package Versions

Closes https://github.com/linuxserver/docker-tvheadend/issues/196

.github/ISSUE_TEMPLATE/issue.bug.md

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

.github/ISSUE_TEMPLATE/issue.bug.yml

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

.github/ISSUE_TEMPLATE/issue.feature.md

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

.github/ISSUE_TEMPLATE/issue.feature.yml

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

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'
@@ -48,8 +48,12 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.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 [bug](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
         pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 

.github/workflows/stale.yml

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

Dockerfile

@@ -209,7 +209,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \
@@ -218,6 +218,11 @@ RUN \
  make -j 2 && \
  make DESTDIR=/tmp/comskip-build install
 
+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
@@ -315,12 +320,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -s -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -329,6 +329,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /
 
 # ports and volumes

Dockerfile.aarch64

@@ -207,7 +207,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \
@@ -216,6 +216,11 @@ RUN \
  make -j 2 && \
  make DESTDIR=/tmp/comskip-build install
 
+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
@@ -309,12 +314,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -323,6 +323,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /
 
 # ports and volumes

Dockerfile.armhf

@@ -208,7 +208,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \
@@ -217,6 +217,11 @@ RUN \
  make -j 2 && \
  make DESTDIR=/tmp/comskip-build install
 
+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
@@ -310,12 +315,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -324,6 +324,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /
 
 # ports and volumes

Jenkinsfile

@@ -59,7 +59,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 .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -287,7 +287,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -353,9 +353,11 @@ pipeline {
               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, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  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
@@ -718,7 +720,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -48,26 +48,17 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/tvheadend:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
-
-## Version Tags
-
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
-
-| Tag | Description |
-| :----: | --- |
-| latest | Current latest release. |
-| release-4.2 | Latest release from 4.2 branch. |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Application Setup
 
@@ -140,16 +131,16 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   tvheadend:
-    image: lscr.io/linuxserver/tvheadend
+    image: lscr.io/linuxserver/tvheadend:latest
     container_name: tvheadend
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - RUN_OPTS=<run options here> #optional
+      - RUN_OPTS= #optional
     volumes:
-      - <path to data>:/config
-      - <path to recordings>:/recordings
+      - /path/to/data:/config
+      - /path/to/recordings:/recordings
     ports:
       - 9981:9981
       - 9982:9982
@@ -167,15 +158,15 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e RUN_OPTS=<run options here> `#optional` \
+  -e RUN_OPTS= `#optional` \
   -p 9981:9981 \
   -p 9982:9982 \
-  -v <path to data>:/config \
-  -v <path to recordings>:/recordings \
+  -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
+  lscr.io/linuxserver/tvheadend:latest
 ```
 
 #### Host vs. Bridge
@@ -194,7 +185,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-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. |
+| `-e RUN_OPTS=` | Optionally specify additional arguments to be passed. See Additional runtime parameters. |
 | `-v /config` | Where TVHeadend show store it's config files. |
 | `-v /recordings` | Where you want the PVR to store recordings. |
 | `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
@@ -243,7 +234,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`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/tvheadend:latest`
 
 ## Updating Info
 
@@ -261,7 +252,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/tvheadend`
+* 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)
@@ -309,6 +300,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.08.22:** - Update sample env vars and how RUN_OPTS are handled.
+* **19.08.22:** - Switch to new picons builder.
+* **16.04.22:** - Added URL XMLTV grabber.
 * **05.01.22:** - Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv.
 * **11.05.21:** - Added Intel iHD driver support.
 * **02.06.20:** - Update to Alpine 3.12.

package_versions.txt

@@ -3,29 +3,29 @@ alpine-keys-2.4-r1
 alsa-lib-1.2.5.1-r1
 aom-libs-3.2.0-r0
 apk-tools-2.12.7-r3
-bash-5.1.8-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r5
 bsd-compat-headers-0.7.2-r3
-busybox-1.34.1-r3
+busybox-1.34.1-r7
 bzip2-1.0.8-r1
-ca-certificates-20191127-r7
-ca-certificates-bundle-20191127-r7
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
 coreutils-9.0-r2
-curl-7.80.0-r0
-expat-2.4.1-r0
+curl-7.80.0-r5
+expat-2.5.0-r0
 ffmpeg-4.4.1-r2
 ffmpeg-libs-4.4.1-r2
 fontconfig-2.13.1-r4
-freetype-2.11.0-r0
+freetype-2.11.1-r2
 fribidi-1.0.11-r0
 fts-1.2.7-r1
 gdbm-1.22-r0
 glib-2.70.1-r0
-gmp-6.2.1-r0
+gmp-6.2.1-r1
 gnu-libiconv-1.16-r0
-gnutls-3.7.1-r0
+gnutls-3.7.1-r1
 graphite2-1.3.14-r0
-gzip-1.11-r0
+gzip-1.12-r0
 harfbuzz-3.0.0-r2
 intel-gmmlib-21.3.3-r0
 intel-media-driver-21.4.1-r0
@@ -34,12 +34,12 @@ less-590-r0
 libacl-2.2.53-r0
 libass-0.15.2-r0
 libattr-2.5.1-r1
-libblkid-2.37.2-r1
+libblkid-2.37.4-r0
 libbsd-0.11.3-r1
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r8
-libcurl-7.80.0-r0
+libcrypto1.1-1.1.1s-r1
+libcurl-7.80.0-r5
 libdav1d-0.9.2-r0
 libdrm-2.4.109-r0
 libdvbcsa-1.1.0-r1
@@ -54,36 +54,36 @@ libidn2-2.3.2-r0
 libintl-0.21-r0
 libjpeg-turbo-2.1.2-r0
 libmd-1.0.3-r0
-libmount-2.37.2-r1
+libmount-2.37.4-r0
 libogg-1.3.5-r0
 libpciaccess-0.16-r0
 libpng-1.6.37-r1
 libproc-3.3.17-r0
-libretls-3.3.4-r2
+libretls-3.3.4-r3
 libsrt-1.4.2-r1
 libssh-0.9.6-r1
-libssl1.1-1.1.1l-r8
+libssl1.1-1.1.1s-r1
 libstdc++-10.3.1_git20211027-r0
-libtasn1-4.18.0-r0
+libtasn1-4.18.0-r1
 libtheora-1.1.1-r16
 libunistring-0.9.10-r1
 liburiparser-0.9.6-r0
-libuuid-2.37.2-r1
+libuuid-2.37.4-r0
 libva-2.13.0-r0
 libva-intel-driver-2.4.1-r0
 libvdpau-1.4-r0
 libvorbis-1.3.7-r0
 libvpx-1.10.0-r0
-libwebp-1.2.1-r0
-libx11-1.7.2-r0
+libwebp-1.2.2-r0
+libx11-1.7.3.1-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
-libxml2-2.9.12-r2
+libxml2-2.9.14-r2
 libxshmfence-1.3-r1
-libxslt-1.1.34-r1
+libxslt-1.1.35-r0
 linux-headers-5.10.41-r0
 linux-pam-1.5.2-r0
 llvm12-libs-12.0.1-r0
@@ -97,15 +97,15 @@ mesa-vdpau-gallium-21.2.6-r0
 mpdecimal-2.5.1-r1
 musl-1.2.2-r7
 musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20211120-r0
-ncurses-terminfo-base-6.3_p20211120-r0
+ncurses-libs-6.3_p20211120-r1
+ncurses-terminfo-base-6.3_p20211120-r1
 nettle-3.7.3-r0
 nghttp2-libs-1.46.0-r0
-openssl-1.1.1l-r8
+openssl-1.1.1s-r1
 opus-1.3.1-r1
 p11-kit-0.24.0-r1
 pcre-8.45-r1
-pcre2-10.39-r0
+pcre2-10.40-r0
 perl-5.34.0-r1
 perl-archive-zip-1.68-r1
 perl-b-hooks-endofscope-0.25-r0
@@ -123,7 +123,7 @@ perl-date-manip-6.86-r0
 perl-datetime-1.54-r1
 perl-datetime-format-strptime-1.79-r0
 perl-datetime-locale-1.33-r0
-perl-datetime-timezone-2.51-r0
+perl-datetime-timezone-2.56-r0
 perl-dbd-sqlite-1.70-r1
 perl-dbi-1.643-r3
 perl-devel-stacktrace-2.04-r3
@@ -231,7 +231,7 @@ py3-charset-normalizer-2.0.7-r0
 py3-idna-3.3-r0
 py3-requests-2.26.0-r1
 py3-urllib3-1.26.7-r0
-python3-3.9.7-r4
+python3-3.9.16-r0
 readline-8.1.1-r0
 s6-ipcserver-2.11.0.0-r0
 scanelf-1.3.3-r0
@@ -240,9 +240,9 @@ shadow-4.8.1-r1
 skalibs-2.11.0.0-r0
 soxr-0.1.3-r2
 sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r3
+ssl_client-1.34.1-r7
 tar-1.34-r0
-tzdata-2021e-r0
+tzdata-2022f-r1
 uriparser-0.9.6-r0
 utmps-0.1.0.3-r0
 v4l-utils-libs-1.22.1-r1
@@ -255,7 +255,7 @@ x264-libs-20210613-r0
 x265-3.5-r0
 x265-libs-3.5-r0
 xvidcore-1.3.7-r1
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
+xz-5.2.5-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r3
 zstd-libs-1.5.0-r0

readme-vars.yml

@@ -19,7 +19,7 @@ available_architectures:
 
 # development version
 # development version
-development_versions: true
+development_versions: false
 development_versions_items:
   - { tag: "latest", desc: "Current latest release." }
   - { tag: "release-4.2", desc: "Latest release from 4.2 branch." }
@@ -33,8 +33,8 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "<path to data>", desc: "Where TVHeadend show store it's config files." }
-  - { vol_path: "/recordings", vol_host_path: "<path to recordings>", desc: "Where you want the PVR to store recordings." }
+  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where TVHeadend show store it's config files." }
+  - { vol_path: "/recordings", vol_host_path: "/path/to/recordings", desc: "Where you want the PVR to store recordings." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "9981", internal_port: "9981", port_desc: "WebUI" }
@@ -45,7 +45,7 @@ cap_add_param: false
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
-  - { env_var: "RUN_OPTS", env_value: "<run options here>", desc: "Optionally specify additional arguments to be passed. See Additional runtime parameters." }
+  - { env_var: "RUN_OPTS", env_value: "", desc: "Optionally specify additional arguments to be passed. See Additional runtime parameters." }
 opt_param_usage_include_vols: false
 opt_param_usage_include_ports: false
 opt_param_device_map: true
@@ -124,6 +124,9 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.08.22:", desc: "Update sample env vars and how RUN_OPTS are handled." }
+  - { date: "19.08.22:", desc: "Switch to new picons builder." }
+  - { date: "16.04.22:", desc: "Added URL XMLTV grabber." }
   - { date: "05.01.22:", desc: "Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv." }
   - { date: "11.05.21:", desc: "Added Intel iHD driver support." }
   - { date: "02.06.20:", desc: "Update to Alpine 3.12." }

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

@@ -14,6 +14,7 @@ mkdir -p \
 
 # extract picons on first run
 [[ -f /picons.tar.bz2 ]] && \
+        mkdir -p /picons
 	tar xf \
 		/picons.tar.bz2 -C \
 		/picons &&

root/etc/services.d/tvheadend/run

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

root/usr/bin/tv_grab_url

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