From 81c71ee54d99cec1ab2f932d47c079a48dc71f6e Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 17 Feb 2019 10:41:49 -0800 Subject: [PATCH 1/3] switching back to clone and checkout --- Dockerfile | 10 +++------- Dockerfile.aarch64 | 10 +++------- Dockerfile.armhf | 10 +++------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d65a902..bc783726 100644 --- a/Dockerfile +++ b/Dockerfile @@ -156,15 +156,11 @@ RUN \ TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \ | 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 \ --disable-avahi \ --disable-bintray_cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2f2b8acf..8b4e1318 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -156,15 +156,11 @@ RUN \ TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \ | 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 \ --disable-avahi \ --disable-bintray_cache \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index baa26b82..c769a811 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -156,15 +156,11 @@ RUN \ TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \ | 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 \ --disable-avahi \ --disable-bintray_cache \ From 6ab17ce8b7cc02f98157cf5e763e86dde2cad90f Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 17 Feb 2019 12:15:38 -0800 Subject: [PATCH 2/3] adding jq package for commit parsing on local build --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index bc783726..f433788a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ RUN \ gettext-dev \ git \ gzip \ + jq \ libgcrypt-dev \ libhdhomerun-dev \ libressl-dev \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8b4e1318..de1cc59e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -31,6 +31,7 @@ RUN \ gettext-dev \ git \ gzip \ + jq \ libgcrypt-dev \ libhdhomerun-dev \ libressl-dev \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c769a811..5db4520d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -31,6 +31,7 @@ RUN \ gettext-dev \ git \ gzip \ + jq \ libgcrypt-dev \ libhdhomerun-dev \ libressl-dev \ From dab37e4ecd5d55c53322393d81e6ff08ef2494a6 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 17 Feb 2019 12:42:34 -0800 Subject: [PATCH 3/3] bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge --- Dockerfile | 12 ++++-------- Dockerfile.aarch64 | 12 ++++-------- Dockerfile.armhf | 12 ++++-------- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index f433788a..d29e3003 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM lsiobase/alpine:3.8 as buildstage # package versions ARG ARGTABLE_VER="2.13" ARG TVH_VER="release/4.2" -ARG XMLTV_VER="0.5.69" +ARG XMLTV_VER="v0.5.70" ARG TVHEADEND_COMMIT # environment settings @@ -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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index de1cc59e..dab6a1e0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -4,7 +4,7 @@ FROM lsiobase/alpine.arm64:3.8 as buildstage # package versions ARG ARGTABLE_VER="2.13" ARG TVH_VER="release/4.2" -ARG XMLTV_VER="0.5.69" +ARG XMLTV_VER="v0.5.70" ARG TVHEADEND_COMMIT # environment settings @@ -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 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5db4520d..151c416b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -4,7 +4,7 @@ FROM lsiobase/alpine.armhf:3.8 as buildstage # package versions ARG ARGTABLE_VER="2.13" ARG TVH_VER="release/4.2" -ARG XMLTV_VER="0.5.69" +ARG XMLTV_VER="v0.5.70" ARG TVHEADEND_COMMIT # environment settings @@ -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 && \ diff --git a/README.md b/README.md index e9e8041f..f058d7e3 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ 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. diff --git a/readme-vars.yml b/readme-vars.yml index d871ce93..c8e4fcf2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -125,6 +125,7 @@ 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." }