⬆️ Bump frenck/action-addon-information from 1.2 to 1.3 (#48)

Bumps [frenck/action-addon-information](https://github.com/frenck/action-addon-information) from 1.2 to 1.3.
- [Release notes](https://github.com/frenck/action-addon-information/releases)
- [Commits](https://github.com/frenck/action-addon-information/compare/v1.2...v1.3)

---
updated-dependencies:
- dependency-name: frenck/action-addon-information
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/CODEOWNERS

@@ -0,0 +1 @@
+.github/* @GauthamVarmaK

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement.
+
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][mozilla coc].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][faq]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[mozilla coc]: https://github.com/mozilla/diversity
+[faq]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

.github/CONTRIBUTING.md

@@ -4,8 +4,8 @@ When contributing to this repository, please first discuss the change you wish
 to make via issue, email, or any other method with the owners of this repository
 before making a change.
 
-Please note we have a code of conduct, please follow it in all your interactions
-with the project.
+Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow
+it in all your interactions with the project.
 
 ## Issues and feature requests
 

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+# Problem/Motivation
+
+> (Why the issue was filed)
+
+## Expected behavior
+
+> (What you expected to happen)
+
+## Actual behavior
+
+> (What actually happened)
+
+## Steps to reproduce
+
+> (How can someone else make/see it happen)
+
+## Proposed changes
+
+> (If you have a proposed change, workaround or fix,
+> describe the rationale behind it)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+# Proposed Changes
+
+> (Describe the changes and rationale behind them)
+
+## Related Issues
+
+> ([Github link][autolink-references] to related issues or pull requests)
+
+[autolink-references]: https://help.github.com/articles/autolinked-references-and-urls/

.github/dependabot.yaml

@@ -6,3 +6,8 @@ updates:
     schedule:
       interval: daily
       time: "06:00"
+  - package-ecosystem: "pip"
+    directory: "/tvheadend/"
+    schedule:
+      interval: daily
+      time: "06:00"

.github/workflows/ci.yaml

@@ -24,10 +24,10 @@ jobs:
       target: ${{ steps.information.outputs.target }}
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run add-on information action
         id: information
-        uses: frenck/action-addon-information@v1.2
+        uses: frenck/action-addon-information@v1.3
 
   lint-addon:
     name: Lint Add-on
@@ -36,9 +36,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run Add-on Lint
-        uses: frenck/action-addon-linter@v2.1
+        uses: frenck/action-addon-linter@v2.5
         with:
           community: true
           path: "./${{ needs.information.outputs.target }}"
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run Hadolint
         uses: brpaz/hadolint-action@v1.5.0
         with:
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run JQ
         run: |
           shopt -s globstar
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run mdl
         uses: actionshub/markdownlint@2.0.2
 
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run Shellcheck
         uses: ludeeus/action-shellcheck@1.1.0
         env:
@@ -92,7 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run YAMLLint
         uses: frenck/action-yamllint@v1.1
 
@@ -101,9 +101,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run Prettier
-        uses: creyD/prettier_action@v3.3
+        uses: creyD/prettier_action@v4.0
         with:
           prettier_options: --write **/*.{json,js,md,yaml}
         env:
@@ -126,21 +126,19 @@ jobs:
         architecture: ${{ fromJson(needs.information.outputs.architectures) }}
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🏗 Set up build cache
         id: cache
         uses: actions/cache@v2.1.6
         with:
           path: /tmp/.docker-cache
-          key:
-            docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha
-            }}
+          key: docker-${{ matrix.architecture }}-${{ github.sha }}
           restore-keys: |
-            docker-${{ github.ref }}-${{ matrix.architecture }}
+            docker-${{ matrix.architecture }}
       - name: 🏗 Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
       - name: 🏗 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v1.6.0
       - name: 🏗 Set up CodeNotary
         run: bash <(curl https://getvcn.codenotary.com -L)
       - name: ℹ️ Compose build flags
@@ -178,7 +176,7 @@ jobs:
               --exit-status \
               '.verification.status == 0'
       - name: 🚀 Build
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v2.7.0
         with:
           push: false
           context: ${{ needs.information.outputs.target }}
@@ -186,7 +184,7 @@ jobs:
           cache-from: |
             type=local,src=/tmp/.docker-cache
             ghcr.io/gauthamvarmak/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge
-          cache-to: type=local,mode=max,dest=/tmp/.docker-cache
+          cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new
           platforms: ${{ steps.flags.outputs.platform }}
           build-args: |
             BUILD_ARCH=${{ matrix.architecture }}
@@ -197,3 +195,11 @@ jobs:
             BUILD_REF=${{ github.sha }}
             BUILD_REPOSITORY=${{ github.repository }}
             BUILD_VERSION=edge
+      # This ugly bit is necessary, or our cache will grow forever...
+      # Well until we hit GitHub's limit of 5GB :)
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
+      - name: 🚚 Swap build cache
+        run: |
+          rm -rf /tmp/.docker-cache
+          mv /tmp/.docker-cache-new /tmp/.docker-cache

.github/workflows/deploy.yaml

@@ -33,10 +33,10 @@ jobs:
       version: ${{ steps.release.outputs.version }}
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run add-on information action
         id: information
-        uses: frenck/action-addon-information@v1.2
+        uses: frenck/action-addon-information@v1.3
       - name: ℹ️ Gather version and environment
         id: release
         run: |
@@ -69,21 +69,19 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🏗 Set up build cache
         id: cache
         uses: actions/cache@v2.1.6
         with:
           path: /tmp/.docker-cache
-          key:
-            docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha
-            }}
+          key: docker-${{ matrix.architecture }}-${{ github.sha }}
           restore-keys: |
-            docker-${{ github.ref }}-${{ matrix.architecture }}
+            docker-${{ matrix.architecture }}
       - name: 🏗 Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
       - name: 🏗 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v1.6.0
       - name: 🏗 Set up CodeNotary
         run: bash <(curl https://getvcn.codenotary.com -L)
       - name: ℹ️ Compose build flags
@@ -108,11 +106,11 @@ jobs:
             exit 1
           fi
       - name: 🏗  Login to GitHub Container Registry
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v1.10.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHRC_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: ⤵️ Download base image
         run: docker pull "${{ steps.flags.outputs.from }}"
       - name: ✅ Verify authenticity of base image
@@ -127,7 +125,7 @@ jobs:
               --exit-status \
               '.verification.status == 0'
       - name: 🚀 Build
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v2.7.0
         with:
           load: true
           # yamllint disable rule:line-length
@@ -140,7 +138,7 @@ jobs:
           cache-from: |
             type=local,src=/tmp/.docker-cache
             ghcr.io/gauthamvarmak/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge
-          cache-to: type=local,mode=max,dest=/tmp/.docker-cache
+          cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new
           platforms: ${{ steps.flags.outputs.platform }}
           build-args: |
             BUILD_ARCH=${{ matrix.architecture }}
@@ -151,6 +149,14 @@ jobs:
             BUILD_REF=${{ github.sha }}
             BUILD_REPOSITORY=${{ github.repository }}
             BUILD_VERSION=${{ needs.information.outputs.version }}
+      # This ugly bit is necessary, or our cache will grow forever...
+      # Well until we hit GitHub's limit of 5GB :)
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
+      - name: 🚚 Swap build cache
+        run: |
+          rm -rf /tmp/.docker-cache
+          mv /tmp/.docker-cache-new /tmp/.docker-cache
       - name: 🔏 Notarize
         # yamllint disable rule:line-length
         run: |
@@ -178,3 +184,27 @@ jobs:
             "ghcr.io/gauthamvarmak/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }}"
           docker push \
             "ghcr.io/gauthamvarmak/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}"
+
+  publish-stable:
+    name: 📢 Publish to stable repository
+    if: needs.information.outputs.environment == 'stable'
+    needs:
+      - information
+      - deploy
+    environment:
+      name: ${{ needs.information.outputs.environment }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🚀 Dispatch repository updater update signal
+        uses: peter-evans/repository-dispatch@v1.1.3
+        with:
+          token: ${{ secrets.DISPATCH_TOKEN }}
+          repository: GauthamVarmaK/hassio-addons
+          event-type: update
+          client-payload: >
+            {
+              "addon": "${{ needs.information.outputs.slug }}",
+              "name": "${{ needs.information.outputs.name }}",
+              "repository": "${{ github.repository }}",
+              "version": "${{ github.event.release.tag_name }}"
+            }

.github/workflows/labels.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
       - name: 🚀 Run Label Syncer
         uses: micnncim/action-label-syncer@v1.3.0
         env:

.github/workflows/lock.yaml

@@ -12,7 +12,7 @@ jobs:
     name: 🔒 Lock closed issues and PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2.0.3
+      - uses: dessant/lock-threads@v3
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: "30"

.github/workflows/pr-labels.yaml

@@ -3,7 +3,7 @@ name: PR Labels
 
 # yamllint disable-line rule:truthy
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, labeled, unlabeled, synchronize]
 
 jobs:
@@ -14,6 +14,7 @@ jobs:
       - name: 🏷 Verify PR has a valid label
         uses: jesusvasquez333/verify-pr-label-action@v1.4.0
         with:
+          pull-request-number: "${{ github.event.pull_request.number }}"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           valid-labels: >-
             breaking-change, bugfix, documentation, enhancement, refactor,

.github/workflows/stale.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🚀 Run stale
-        uses: actions/stale@v3.0.19
+        uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

tvheadend/DOCS.md

@@ -17,7 +17,8 @@ Have included the following along with TVHeadend:
 The installation of this add-on is pretty straightforward and not different in
 comparison to installing any other Home Assistant add-on.
 
-1. Install "Gautham's Add-ons" in supervisor.
+1. Add this repository to have addons by GauthamVarmaK:
+   [![Home Assistant with repository URL pre-filled][my-ha-shield]][my-ha-repo]
 1. Search for the "TVHeadend" add-on in the Supervisor add-on store and install it.
 1. Start the "TVHeadend" add-on.
 1. Check the logs of the "TVHeadend" to see if everything went well.
@@ -26,11 +27,40 @@ comparison to installing any other Home Assistant add-on.
 
 ## Configuration
 
-No changes needed from the user, unless u need to change the ports.
+**Note**: _Remember to restart the add-on when the configuration is changed._
 
--Config files are stored in /config/tvheadend/
--Recording files are stored in /config/tvheadend/recordings/
-Consider, backing them up whenever migrating.
+Example add-on configuration:
+
+```yaml
+system_packages:
+  - ffmpeg
+init_commands:
+  - echo 'Hello World'
+```
+
+**Note**: _This is just an example, don't copy and paste it! Create your own!_
+
+### Option: `system_packages`
+
+Allows you to specify additional [Alpine packages][alpine-packages] to be
+installed to the TVHeadend Addon (e.g., `ffmpeg`, `g++`, etc. ).
+
+**Note**: _Adding many packages will result in a longer start-up time for the add-on._
+
+### Option: `init_commands`
+
+Customize your TVHeadend environment even more with the `init_commands` option.
+Add one or more shell commands to the list, and they will be executed
+every single time this add-on starts.
+
+## Additional Details
+
+- Config files are stored in `/config/tvheadend/`
+- Recording files are stored in `/config/tvheadend/recordings/`
+- `/dev/dvb/`, `/dev/dri/` would be respectively mapped to
+  `/dev/dvb/`, `/dev/dri/` inside the addon.
+
+Consider, backing `/config/tvheadend/` up whenever migrating.
 
 ## Changelog & Releases
 
@@ -84,8 +114,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+[alpine-packages]: https://pkgs.alpinelinux.org/packages
 [forum]: https://community.home-assistant.io/
-[gautham]: https://github.com/GauthamVarmaK
 [frenck]: https://github.com/frenck
+[gautham]: https://github.com/GauthamVarmaK
+[my-ha-shield]: https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg
 [issue]: https://github.com/GauthamVarmaK/addon-tvheadend/issues
+[semver]: http://semver.org/spec/v2.0.0.htm
+[my-ha-repo]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2FGauthamVarmaK%2Fhassio-addons
 [releases]: https://github.com/GauthamVarmaK/addon-tvheadend/releases

tvheadend/Dockerfile

@@ -1,29 +1,56 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.2.2
+ARG BUILD_FROM
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
-COPY run.sh /run.sh
-RUN chmod +x /run.sh
-RUN /run.sh
+COPY requirements.txt /tmp/
 
-RUN echo "Starting TVHeadend"
-ENTRYPOINT ["/usr/bin/tvheadend", "--firstrun", "-u", "root", "-g", "root", "-c", "/config/tvheadend"]
+RUN \
+    apk update \
+    && apk add --no-cache --virtual .build-deps \
+        musl-dev=1.2.2-r3 \
+        gcc=10.3.1_git20210424-r2 \
+        g++=10.3.1_git20210424-r2 \
+        libxml2-dev=2.9.12-r1 \
+        libxslt-dev=1.1.34-r1 \
+        python3-dev=3.9.5-r1 \
+    && apk add --no-cache \
+        tvheadend=4.2.8-r3 \
+        py3-pip=20.3.4-r1 \
+        libxslt=1.1.34-r1 \
+    && pip3 install \
+        --no-cache-dir \
+        --prefer-binary \
+        -r /tmp/requirements.txt \
+    && apk del --no-cache --purge .build-deps
+
+# Copy root filesystem
+COPY rootfs /
+
+# Build arguments
+ARG BUILD_ARCH
+ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
+ARG BUILD_REF
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION
 
 # Labels
 LABEL \
-    io.hass.name="TVHeadend" \
-    io.hass.description="TVHeadend Add-On" \
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
     io.hass.arch="${BUILD_ARCH}" \
     io.hass.type="addon" \
     io.hass.version=${BUILD_VERSION} \
-    maintainer="https://github.com/GauthamVarmaK" \
-    org.label-schema.description="TVHeadend Home Assistant Add-On" \
-    org.label-schema.build-date=${BUILD_DATE} \
-    org.label-schema.name="TVHeadend" \
-    org.label-schema.name="Home Assistant Addon: TVHeadend ${BUILD_ARCH}" \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://github.com/GauthamVarmaK/addon-tvheadend" \
-    org.label-schema.usage="https://github.com/GauthamVarmaK/addon-tvheadend" \
-    org.label-schema.vcs-ref=${BUILD_REF} \
-    org.label-schema.vcs-url="https://github.com/GauthamVarmaK/addon-tvheadend" \
-    org.label-schema.vendor="https://github.com/GauthamVarmaK"
+    maintainer="Gautham Varma K <43441192+GauthamVarmaK@users.noreply.github.com>" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="GauthamVarmaK" \
+    org.opencontainers.image.authors="Gautham Varma K <43441192+GauthamVarmaK@users.noreply.github.com>" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/GauthamVarmaK/addon-tvheadend" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}

tvheadend/build.json

@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.2.2",
-    "amd64": "ghcr.io/hassio-addons/base/amd64:9.2.2",
-    "armhf": "ghcr.io/hassio-addons/base/armhf:9.2.2",
-    "armv7": "ghcr.io/hassio-addons/base/armv7:9.2.2",
-    "i386": "ghcr.io/hassio-addons/base/i386:9.2.2"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.1.1",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:10.1.1",
+    "armhf": "ghcr.io/hassio-addons/base/armhf:10.1.1",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:10.1.1",
+    "i386": "ghcr.io/hassio-addons/base/i386:10.1.1"
   }
 }

tvheadend/config.json

@@ -2,12 +2,12 @@
   "name": "TVHeadend",
   "version": "dev",
   "stage": "experimental",
-  "slug": "addon-tvheadend",
+  "slug": "tvheadend",
   "description": "TV streaming server and recorder.",
   "url": "https://github.com/GauthamVarmaK/addon-tvheadend",
-  "startup": "services",
   "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
   "webui": "http://[HOST]:[PORT:9981]/",
+  "devices": ["/dev/dvb/", "/dev/dri/"],
   "ports": {
     "9981/tcp": 9981,
     "9982/tcp": 9982
@@ -16,5 +16,13 @@
     "9981/tcp": "TVH Web Interface",
     "9982/tcp": "TVH HTSP"
   },
-  "map": ["config:rw"]
+  "map": ["config:rw"],
+  "options": {
+    "system_packages": [],
+    "init_commands": []
+  },
+  "schema": {
+    "system_packages": ["str"],
+    "init_commands": ["str"]
+  }
 }

tvheadend/requirements.txt

@@ -0,0 +1,2 @@
+setuptools==58.4.0
+streamlink==2.4.0

tvheadend/rootfs/etc/cont-init.d/customizations.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Executes user customizations on startup
+# ==============================================================================
+
+# Install user configured/requested packages
+if bashio::config.has_value 'system_packages'; then
+    apk update \
+        || bashio::exit.nok 'Failed updating Alpine packages repository indexes'
+
+    for package in $(bashio::config 'system_packages'); do
+        apk add "$package" \
+            || bashio::exit.nok "Failed installing system package ${package}"
+    done
+fi
+
+# Executes user commands on startup
+if bashio::config.has_value 'init_commands'; then
+    while read -r cmd; do
+        eval "${cmd}" \
+            || bashio::exit.nok "Failed executing init command: ${cmd}"
+    done <<< "$(bashio::config 'init_commands')"
+fi

tvheadend/rootfs/etc/cont-init.d/tvheadend.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Executes user customizations on startup
+# ==============================================================================
+
+check_webgrabplus(){
+    if [ -z "$(ls -A /config/tvheadend/wg++)" ]; then return 1; else return 0; fi
+}
+
+webgrabplus_install(){
+    if apk update; then
+        bashio::log.info '[Webgrab+] APK: Installing required packages.'
+        if apk add --no-cache --virtual .build-deps git mono --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; then
+            bashio::log.info '[Webgrab+] Installing Webgrab+.'
+            cd /tmp \
+            && wget http://webgrabplus.com/sites/default/files/download/SW/V3.2.0/WebGrabPlus_V3.2_install.tar.gz  \
+            && tar -zxvf WebGrabPlus_V3.2_install.tar.gz \
+            && rm WebGrabPlus_V3.2_install.tar.gz  \
+            && mv .wg++/ /config/tvheadend/wg++  \
+            && cd /config/tvheadend/wg++  \
+            && ./install.sh \
+            && rm -rf siteini.pack/  \
+            && wget http://webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip \
+            && unzip SiteIniPack_current.zip \
+            && rm SiteIniPack_current.zip \
+            && cp siteini.pack/India/* siteini.user/ \
+            && wget -O /usr/bin/tv_grab_wg++ http://www.webgrabplus.com/sites/default/files/tv_grab_wg.txt \
+            && sed -i 's|~/.wg++/guide.xml|/config/tvheadend/wg++/guide.xml|g' /usr/bin/tv_grab_wg++ \
+            && chmod a+x /usr/bin/tv_grab_wg++
+        else
+            bashio::log.info '[Webgrab+] APK: Critical error. Unable install required packages.'
+            exit 1
+        fi
+        bashio::log.info '[Webgrab+] APK: Removing packages no longer required.'
+        apk del --no-cache --purge .build-deps
+    else
+        bashio::log.error '[Webgrab+] APK: Critical error. Unable to update pkg list. Check connectivity.'
+        exit 1
+    fi
+    bashio::log.info '[Webgrab+] Finsihed all APK and PIP3 updates and installs.'
+}
+
+# Ensure directory exists
+if ! bashio::fs.directory_exists '/config/tvheadend/'; then
+    bashio::log.info "Creating default configuration directory at /config/tvheadend/"
+    mkdir -p /config/tvheadend/recordings
+    timeout 20s /usr/bin/tvheadend --firstrun -u root -g root -c /config/tvheadend
+fi
+
+if check_webgrabplus; then
+    bashio::log.info "[Webgrab+] Webgrab+ already installed"
+else
+    bashio::log.info "[Webgrab+] No webgrab+ installation found - Installing webgrab+"
+    webgrabplus_install
+    chmod +x /usr/bin/restart_addon
+    exec /usr/bin/restart_addon
+fi
+
+bashio::log.info '[Webgrab+] Setup completed without errors!!'

tvheadend/rootfs/etc/cron.d/webgrabplus

@@ -0,0 +1 @@
+0 0 * * * /config/tvheadend/wg++/run.sh

tvheadend/rootfs/etc/services.d/cron/finish

@@ -0,0 +1,9 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Take down the S6 supervision tree when crond fails
+# ==============================================================================
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services

tvheadend/rootfs/etc/services.d/cron/run

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Runs the cron daemon
+# ==============================================================================
+exec fdmove -c 2 1 /usr/sbin/crond -f -L /var/log/cron -l 0 -c /etc/crontabs

tvheadend/rootfs/etc/services.d/tvheadend/finish

@@ -0,0 +1,9 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Take down the S6 supervision tree when TVHeadend fails
+# ==============================================================================
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services

tvheadend/rootfs/etc/services.d/tvheadend/run

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Starts TVHeadend
+# ==============================================================================
+
+bashio::log.info "Starting TVHeadend..."
+
+exec /usr/bin/tvheadend -u root -g root -c /config/tvheadend

tvheadend/rootfs/usr/bin/restart_addon

@@ -0,0 +1,9 @@
+#!/usr/bin/env bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TVHeadend
+# Restarts the add-on
+# ==============================================================================
+
+echo "Restarting add-on"
+
+bashio::addon.restart

tvheadend/run.sh

@@ -1,96 +0,0 @@
-#!/usr/bin/env bashio
-
-bashio::log.info "[TVHeadend] Installing TVHeadend"
-apk update && apk add --no-cache tvheadend=4.2.8-r3
-
-mkdir -p /config/tvheadend/recordings
-
-bashio::log.info '[TVHeadend] Setup completed without errors!!'
-
-check_webgrabplus(){
-    if [ -z "$(ls -A /config/tvheadend/wg++)" ]; then return 1; else return 0; fi
-}
-
-webgrabplus_install(){
-    if apk update; then
-        bashio::log.info '[Webgrab+] APK: Installing required packages.'
-        if apk add --no-cache --virtual .build-deps git mono --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; then
-            bashio::log.info '[Webgrab+] Installing Webgrab+.'
-            mkdir -p ~/.wg++
-            ln -sf /config/tvheadend/wg++/guide.xml ~/.wg++/guide.xml
-            cd /tmp  && \
-                wget http://webgrabplus.com/sites/default/files/download/SW/V3.1.0/WebGrabPlus_V3.1_install.tar.gz  && \
-                tar -xvf WebGrabPlus_V3.1_install.tar.gz && rm WebGrabPlus_V3.1_install.tar.gz  && \
-                mv .wg++/ /config/tvheadend/wg++  && cd /config/tvheadend/wg++  && ./install.sh
-            rm -rf siteini.pack/  && \
-                git clone https://github.com/DeBaschdi/webgrabplus-siteinipack.git  && \
-                cp -R webgrabplus-siteinipack/siteini.pack/ siteini.pack  && \
-                cp siteini.pack/International/horizon.tv.* siteini.user/
-
-            wget -O /usr/bin/tv_grab_wg++ http://www.webgrabplus.com/sites/default/files/tv_grab_wg.txt  && \
-                chmod a+x /usr/bin/tv_grab_wg++
-
-            echo "0 0 * * * /config/tvheadend/wg++/run.sh" >> /var/spool/cron/root
-            crond
-        else
-            bashio::log.info '[Webgrab+] APK: Critical error. Unable install required packages.'
-            exit 1
-        fi
-        bashio::log.info '[Webgrab+] APK: Removing packages no longer required.'
-        apk del .build-deps git mono
-    else
-        bashio::log.error '[Webgrab+] APK: Critical error. Unable to update pkg list. Check connectivity.'
-        exit 1
-    fi
-    bashio::log.info '[Webgrab+] Finsihed all APK and PIP3 updates and installs.'
-}
-
-if check_webgrabplus; then
-    bashio::log.info "[Webgrab+] Webgrab+ already installed"
-else
-    bashio::log.info "[Webgrab+] No webgrab+ installation found - Installing webgrab+"
-    webgrabplus_install
-fi
-
-bashio::log.info '[Webgrab+] Setup completed without errors!!'
-
-check_streamlink () {
-    if [ -z "$(command -v streamlink)" ]; then return 1; else return 0; fi
-}
-
-streamlink_update () {
-    if pip3 install --no-cache --upgrade streamlink; then
-        bashio::log.info "[StreamLink] Streamlink version: $(streamlink --version)."
-    else
-        bashio::log.error '[StreamLink] Streamlink update failed!'
-    fi
-}
-
-streamlink_install () {
-    bashio::log.info '[StreamLink] APK: Updating pkg list.'
-    if apk update; then
-        bashio::log.info '[StreamLink] APK: Installing required packages.'
-        if apk add --no-cache py3-pip && apk add --no-cache --virtual .build-deps musl-dev gcc; then
-            bashio::log.info '[StreamLink] PIP3: Updating and installing required packages.'
-            if ! pip3 install --no-cache --upgrade setuptools; then bashio::log.error '[StreamLink] PIP3: Error while upgrading setuptools.'; fi
-            if ! pip3 install --no-cache streamlink; then bashio::log.error '[StreamLink] PIP3: Error while installing Streamlink.'; fi
-        else
-            bashio::log.info '[StreamLink] APK: Critical error. Unable install required packages.'
-            exit 1
-        fi
-        bashio::log.info '[StreamLink] APK: Removing packages no longer required.'
-        apk del .build-deps gcc musl-dev
-    else
-        bashio::log.error '[StreamLink] APK: Critical error. Unable to update pkg list. Check connectivity.'
-        exit 1
-    fi
-    bashio::log.info '[StreamLink] Finsihed all APK and PIP3 updates and installs.'
-}
-
-if check_streamlink; then
-    bashio::log.info '[StreamLink] Updating Streamlink...' ; streamlink_update
-else
-    bashio::log.info '[StreamLink] Installing Streamlink...'; streamlink_install
-fi
-
-bashio::log.info '[StreamLink] Setup completed without errors!!'