Merge pull request #113 from thelamer/master

switching back to clone and checkout
bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge
2019-02-17 22:54:51 +01:00 · 2019-02-17 12:45:28 -08:00 · 2019-02-17 10:38:54 -08:00 · 2019-02-16 21:29:10 +01:00 · 2019-02-16 09:22:18 -08:00 · 2019-02-15 13:03:48 -08:00
7 changed files with 62 additions and 54 deletions
--- a/30
+++ b/30
@@ -3,7 +3,7 @@ FROM lsiobase/alpine:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="0.5.69"
+ARG XMLTV_VER="v0.5.70"

 # environment settings
 ARG TZ="Europe/Oslo"
@@ -124,13 +124,9 @@ RUN \

 RUN \
 echo "**** compile XMLTV ****" && \
- curl -o \
- /tmp/xmtltv-src.tar.bz2 -L \
-	"https://sourceforge.net/projects/xmltv/files/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
- tar xf \
- /tmp/xmtltv-src.tar.bz2 -C \
-	/tmp --strip-components=1 && \
- cd "/tmp/xmltv-${XMLTV_VER}" && \
+ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
+ cd /tmp/xmltv && \
+ git checkout ${XMLTV_VER} && \
 echo "**** Perl 5.26 fixes for XMTLV ****" && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -150,15 +146,11 @@ RUN \
 	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
 	| jq -r '. | .sha'); \
 fi && \
- curl -o \
-	/tmp/tvheadend.tar.gz -L \
-	"https://github.com/tvheadend/tvheadend/archive/${TVHEADEND_COMMIT}.tar.gz" && \
 mkdir -p \
 	/tmp/tvheadend && \
- tar xf \
-	/tmp/tvheadend.tar.gz -C \
-	/tmp/tvheadend/ --strip-components=1 && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
 cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
 	`#Encoding` \
 	--disable-ffmpeg_static \
@@ -326,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/
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -3,7 +3,7 @@ FROM lsiobase/alpine.arm64:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="0.5.69"
+ARG XMLTV_VER="v0.5.70"

 # environment settings
 ARG TZ="Europe/Oslo"
@@ -123,13 +123,9 @@ RUN \

 RUN \
 echo "**** compile XMLTV ****" && \
- curl -o \
- /tmp/xmtltv-src.tar.bz2 -L \
-	"https://sourceforge.net/projects/xmltv/files/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
- tar xf \
- /tmp/xmtltv-src.tar.bz2 -C \
-	/tmp --strip-components=1 && \
- cd "/tmp/xmltv-${XMLTV_VER}" && \
+ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
+ cd /tmp/xmltv && \
+ git checkout ${XMLTV_VER} && \
 echo "**** Perl 5.26 fixes for XMTLV ****" && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -146,18 +142,14 @@ RUN \
 RUN \
 echo "**** compile tvheadend ****" && \
 if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-	| jq -r '. | .sha'); \
+        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+        | jq -r '. | .sha'); \
 fi && \
- curl -o \
-	/tmp/tvheadend.tar.gz -L \
-	"https://github.com/tvheadend/tvheadend/archive/${TVHEADEND_COMMIT}.tar.gz" && \
 mkdir -p \
-	/tmp/tvheadend && \
- tar xf \
-	/tmp/tvheadend.tar.gz -C \
-	/tmp/tvheadend/ --strip-components=1 && \
+        /tmp/tvheadend && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
 cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
 	`#Encoding` \
 	--disable-ffmpeg_static \
@@ -325,8 +317,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/
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,7 +3,7 @@ FROM lsiobase/alpine.armhf:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="0.5.69"
+ARG XMLTV_VER="v0.5.70"

 # environment settings
 ARG TZ="Europe/Oslo"
@@ -123,13 +123,9 @@ RUN \

 RUN \
 echo "**** compile XMLTV ****" && \
- curl -o \
- /tmp/xmtltv-src.tar.bz2 -L \
-	"https://sourceforge.net/projects/xmltv/files/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
- tar xf \
- /tmp/xmtltv-src.tar.bz2 -C \
-	/tmp --strip-components=1 && \
- cd "/tmp/xmltv-${XMLTV_VER}" && \
+ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
+ cd /tmp/xmltv && \
+ git checkout ${XMLTV_VER} && \
 echo "**** Perl 5.26 fixes for XMTLV ****" && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
 sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -146,18 +142,14 @@ RUN \
 RUN \
 echo "**** compile tvheadend ****" && \
 if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-	| jq -r '. | .sha'); \
+        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+        | jq -r '. | .sha'); \
 fi && \
- curl -o \
-	/tmp/tvheadend.tar.gz -L \
-	"https://github.com/tvheadend/tvheadend/archive/${TVHEADEND_COMMIT}.tar.gz" && \
 mkdir -p \
-	/tmp/tvheadend && \
- tar xf \
-	/tmp/tvheadend.tar.gz -C \
-	/tmp/tvheadend/ --strip-components=1 && \
+        /tmp/tvheadend && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
 cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
 	`#Encoding` \
 	--disable-ffmpeg_static \
@@ -325,8 +317,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/
--- a/README.md
+++ b/README.md
@@ -242,6 +242,8 @@ Below are the instructions for updating containers:

 ## Versions

+* **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
+* **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.
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -125,6 +125,8 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
+  - { 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." }
--- a/root/defaults/config
+++ b/root/defaults/config
@@ -0,0 +1,7 @@
+{
+        "prefer_picon": true,
+        "chiconpath": "file:///picons/%C.png",
+        "piconpath": "file:///picons/",
+        "piconscheme": 0,
+        "chiconscheme": 2
+}
--- 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 \
Author	SHA1	Message	Date
saarg	9dceb0a4ce	Merge pull request #113 from thelamer/master switching back to clone and checkout	2019-02-17 22:54:51 +01:00
thelamer	22ed8475c7	bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge	2019-02-17 12:45:28 -08:00
thelamer	c7ce0c4832	switching back to clone and checkout	2019-02-17 10:38:54 -08:00
saarg	822dbde249	Merge pull request #110 from thelamer/master Fixes for picons	2019-02-16 21:29:10 +01:00
thelamer	cd3964e06c	making requested changes to default config	2019-02-16 09:22:18 -08:00
thelamer	70f300d86a	forgot schema value	2019-02-15 13:03:48 -08:00
thelamer	25979ad455	fixing paths for initial config	2019-02-15 12:57:46 -08:00
thelamer	1306f8cf2d	need to untar picons for htem to be read by the app	2019-02-15 11:44:23 -08:00
thelamer	f19ad9ca20	updating changelog	2019-02-14 22:21:30 -08:00
thelamer	c0a37a6b8b	adding picons path to config if this is a first boot	2019-02-14 22:15:47 -08:00