diff --git a/README.md b/README.md index 0d27d9b..8c71b28 100644 --- a/README.md +++ b/README.md @@ -60,15 +60,6 @@ The architectures supported by this image are: | arm64 | ✅ | arm64v8-\ | | armhf| ✅ | arm32v7-\ | -## 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. - -| Tag | Available | Description | -| :----: | :----: |--- | -| latest | ✅ | Current latest release. | -| release-4.2 | ✅ | Latest release from 4.2 branch. | - ## 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. @@ -146,10 +137,10 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/London - - RUN_OPTS= #optional + - RUN_OPTS= #optional volumes: - - :/config - - :/recordings + - /path/to/data:/config + - /path/to/recordings:/recordings ports: - 9981:9981 - 9982:9982 @@ -167,11 +158,11 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ - -e RUN_OPTS= `#optional` \ + -e RUN_OPTS= `#optional` \ -p 9981:9981 \ -p 9982:9982 \ - -v :/config \ - -v :/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 \ @@ -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=` | 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). | @@ -309,6 +300,7 @@ 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. diff --git a/readme-vars.yml b/readme-vars.yml index b61cd2c..377003d 100644 --- a/readme-vars.yml +++ b/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: "", desc: "Where TVHeadend show store it's config files." } - - { vol_path: "/recordings", vol_host_path: "", 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: "", 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,7 @@ 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." } diff --git a/root/etc/services.d/tvheadend/run b/root/etc/services.d/tvheadend/run index 9baffde..708714c 100755 --- a/root/etc/services.d/tvheadend/run +++ b/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