Ver Fonte

bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge

thelamer há 7 anos atrás
pai
commit
22ed8475c7
5 ficheiros alterados com 14 adições e 24 exclusões
  1. 4 8
      Dockerfile
  2. 4 8
      Dockerfile.aarch64
  3. 4 8
      Dockerfile.armhf
  4. 1 0
      README.md
  5. 1 0
      readme-vars.yml

+ 4 - 8
Dockerfile

@@ -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 && \

+ 4 - 8
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 && \

+ 4 - 8
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 && \

+ 1 - 0
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.

+ 1 - 0
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." }