From c0a37a6b8b3dd7e87b2fceca816d06e29f45a7fc Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Feb 2019 22:15:47 -0800 Subject: [PATCH 1/6] adding picons path to config if this is a first boot --- root/defaults/config | 6 ++++++ root/etc/cont-init.d/30-config | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 root/defaults/config 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 f19ad9ca201618593ade9da364363314cabff2aa Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Feb 2019 22:21:30 -0800 Subject: [PATCH 2/6] updating changelog --- README.md | 1 + readme-vars.yml | 1 + 2 files changed, 2 insertions(+) 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." } From 1306f8cf2de0ed41ea746ac994810c68890ff2d9 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 11:44:23 -0800 Subject: [PATCH 3/6] 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 4bea59a7..206e0708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -326,8 +326,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 4ecdfc08..7c21e55a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -325,8 +325,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 b59eba1a..757af62c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -325,8 +325,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 25979ad455f135387500c77d5799ac342e1bd150 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 12:57:46 -0800 Subject: [PATCH 4/6] 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 70f300d86a2d5dbd86ea0a7cc400311fdd678d29 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Feb 2019 13:03:48 -0800 Subject: [PATCH 5/6] forgot schema value --- root/defaults/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/root/defaults/config b/root/defaults/config index 51f5d238..eccaa6ff 100644 --- a/root/defaults/config +++ b/root/defaults/config @@ -1,6 +1,7 @@ { - "prefer_picon": false, - "chiconpath": "file:///picons/%C.png", - "piconpath": "file:///picons/", - "piconscheme": 0 + "prefer_picon": false, + "chiconpath": "file:///picons/%C.png", + "piconpath": "file:///picons/", + "piconscheme": 0, + "chiconscheme": 2 } From cd3964e06c573c8f6667bc75248b29441e0d3b3b Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 16 Feb 2019 09:22:18 -0800 Subject: [PATCH 6/6] 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 eccaa6ff..a19d9920 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,