Merge pull request #204 from linuxserver/envvars

clean up env vars, update run opts handling

Dockerfile

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

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

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

README.md

@@ -60,15 +60,6 @@ The architectures supported by this image are:
 | arm64 | ✅ | arm64v8-\<version tag\> |
 | armhf| ✅ | arm32v7-\<version tag\> |
 
-## 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=<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,11 +158,11 @@ 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 \
@@ -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). |
@@ -309,6 +300,8 @@ 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.

package_versions.txt

@@ -6,24 +6,24 @@ apk-tools-2.12.7-r3
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
 bsd-compat-headers-0.7.2-r3
-busybox-1.34.1-r5
+busybox-1.34.1-r7
 bzip2-1.0.8-r1
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
 coreutils-9.0-r2
-curl-7.80.0-r1
+curl-7.80.0-r2
 expat-2.4.7-r0
 ffmpeg-4.4.1-r2
 ffmpeg-libs-4.4.1-r2
 fontconfig-2.13.1-r4
-freetype-2.11.1-r1
+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-r1
 gnu-libiconv-1.16-r0
-gnutls-3.7.1-r0
+gnutls-3.7.1-r1
 graphite2-1.3.14-r0
 gzip-1.12-r0
 harfbuzz-3.0.0-r2
@@ -38,8 +38,8 @@ 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.1n-r0
-libcurl-7.80.0-r1
+libcrypto1.1-1.1.1q-r0
+libcurl-7.80.0-r2
 libdav1d-0.9.2-r0
 libdrm-2.4.109-r0
 libdvbcsa-1.1.0-r1
@@ -62,7 +62,7 @@ libproc-3.3.17-r0
 libretls-3.3.4-r3
 libsrt-1.4.2-r1
 libssh-0.9.6-r1
-libssl1.1-1.1.1n-r0
+libssl1.1-1.1.1q-r0
 libstdc++-10.3.1_git20211027-r0
 libtasn1-4.18.0-r0
 libtheora-1.1.1-r16
@@ -81,7 +81,7 @@ libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
-libxml2-2.9.13-r0
+libxml2-2.9.14-r1
 libxshmfence-1.3-r1
 libxslt-1.1.35-r0
 linux-headers-5.10.41-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.1n-r0
+openssl-1.1.1q-r0
 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
@@ -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.13-r1
 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-r5
+ssl_client-1.34.1-r7
 tar-1.34-r0
-tzdata-2022a-r0
+tzdata-2022c-r0
 uriparser-0.9.6-r0
 utmps-0.1.0.3-r0
 v4l-utils-libs-1.22.1-r1
@@ -257,5 +257,5 @@ x265-libs-3.5-r0
 xvidcore-1.3.7-r1
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-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,8 @@ 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." }

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