From 322e35bb009a34274d1b827bf1414d5422768b76 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Feb 2019 22:19:37 -0800 Subject: [PATCH 1/5] adding picons path to config if this is a first boot --- README.md | 1 + readme-vars.yml | 1 + root/defaults/config | 6 ++++++ root/etc/cont-init.d/30-config | 3 +++ 4 files changed, 11 insertions(+) create mode 100644 root/defaults/config 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..a1bedbf5 --- /dev/null +++ b/root/defaults/config @@ -0,0 +1,6 @@ +{ + "prefer_picon": false, + "chiconpath": "file://picons/%C.png", + "piconpath": "file://picons/", + "piconscheme": 0 +} 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 \ From ab115449e728a2d1a3543a3089a524af908cf723 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 11:45:41 -0800 Subject: [PATCH 2/5] need to untar picons for htem to be read by the app --- Dockerfile | 10 ++++++++-- Dockerfile.aarch64 | 10 ++++++++-- Dockerfile.armhf | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) 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/ From e834619ec35ebabfdb12c18c04b0352d88c8056c Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 12:58:34 -0800 Subject: [PATCH 3/5] fixing paths for initial config --- root/defaults/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/defaults/config b/root/defaults/config index a1bedbf5..51f5d238 100644 --- a/root/defaults/config +++ b/root/defaults/config @@ -1,6 +1,6 @@ { "prefer_picon": false, - "chiconpath": "file://picons/%C.png", - "piconpath": "file://picons/", + "chiconpath": "file:///picons/%C.png", + "piconpath": "file:///picons/", "piconscheme": 0 } From 7d94cc4b64bf2e014ef3f5a01a0d294a4da626e3 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 13:03:14 -0800 Subject: [PATCH 4/5] forgot schema value --- root/defaults/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/defaults/config b/root/defaults/config index 51f5d238..92388633 100644 --- a/root/defaults/config +++ b/root/defaults/config @@ -2,5 +2,6 @@ "prefer_picon": false, "chiconpath": "file:///picons/%C.png", "piconpath": "file:///picons/", - "piconscheme": 0 + "piconscheme": 0, + "chiconscheme": 2 } From 65b2f3c3c79cd3077fcfff7bf13e1bdf3059906c Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 16 Feb 2019 09:23:06 -0800 Subject: [PATCH 5/5] making requested changes to default config --- root/defaults/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/config b/root/defaults/config index 92388633..b860f513 100644 --- a/root/defaults/config +++ b/root/defaults/config @@ -1,5 +1,5 @@ { - "prefer_picon": false, + "prefer_picon": true, "chiconpath": "file:///picons/%C.png", "piconpath": "file:///picons/", "piconscheme": 0,