diff --git a/Dockerfile b/Dockerfile index ac7102d6..3d65a902 100644 --- a/Dockerfile +++ b/Dockerfile @@ -318,8 +318,14 @@ RUN \ echo "**** Add Picons ****" && \ mkdir -p /picons && \ curl -o \ - /picons/picons.tar.bz2 -L \ - https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 + /tmp/picons.tar.bz2 -L \ + https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 && \ + tar xf \ + /tmp/picons.tar.bz2 -C \ + /picons && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # copy local files and buildstage artifacts COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5ee0d620..2f2b8acf 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -321,8 +321,14 @@ RUN \ echo "**** Add Picons ****" && \ mkdir -p /picons && \ curl -o \ - /picons/picons.tar.bz2 -L \ - https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 + /tmp/picons.tar.bz2 -L \ + https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 && \ + tar xf \ + /tmp/picons.tar.bz2 -C \ + /picons && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # copy local files and buildstage artifacts COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index db3af809..baa26b82 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -321,8 +321,14 @@ RUN \ echo "**** Add Picons ****" && \ mkdir -p /picons && \ curl -o \ - /picons/picons.tar.bz2 -L \ - https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 + /tmp/picons.tar.bz2 -L \ + https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2 && \ + tar xf \ + /tmp/picons.tar.bz2 -C \ + /picons && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # copy local files and buildstage artifacts COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ diff --git a/README.md b/README.md index b1b97a65..e9e8041f 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ Below are the instructions for updating containers: ## Versions +* **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. diff --git a/readme-vars.yml b/readme-vars.yml index caf7a53e..d871ce93 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -125,6 +125,7 @@ app_setup_block: | # changelog changelogs: + - { 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." } diff --git a/root/defaults/config b/root/defaults/config new file mode 100644 index 00000000..b860f513 --- /dev/null +++ b/root/defaults/config @@ -0,0 +1,7 @@ +{ + "prefer_picon": true, + "chiconpath": "file:///picons/%C.png", + "piconpath": "file:///picons/", + "piconscheme": 0, + "chiconscheme": 2 +} diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index a3414249..6fff236a 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -9,6 +9,9 @@ mkdir -p \ (mkdir -p /config/dvr/config && cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/dvr/config/7a5edfbe189851e5b1d1df19c93962f0) [[ ! -e /config/comskip/comskip.ini ]] && \ cp /defaults/comskip.ini.org /config/comskip/comskip.ini +[[ ! -e /config/config ]] && \ + (cp /defaults/config /config/config) + # permissions chown -R abc:abc \