forked from Ivasoft/docker-tvheadend
Compare commits
12 Commits
797af7c7-p
...
d2405f29-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
e6bb2a1641 | ||
|
|
a702166af3 | ||
|
|
9dceb0a4ce | ||
|
|
22ed8475c7 | ||
|
|
c7ce0c4832 | ||
|
|
822dbde249 | ||
|
|
cd3964e06c | ||
|
|
70f300d86a | ||
|
|
25979ad455 | ||
|
|
1306f8cf2d | ||
|
|
f19ad9ca20 | ||
|
|
c0a37a6b8b |
30
Dockerfile
30
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 && \
|
||||
@@ -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/
|
||||
|
||||
@@ -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/
|
||||
|
||||
@@ -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/
|
||||
|
||||
10
README.md
10
README.md
@@ -14,12 +14,6 @@ Find us at:
|
||||
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
|
||||
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
|
||||
|
||||
# PSA: Changes are happening
|
||||
|
||||
From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag.
|
||||
|
||||
TLDR: Multi-arch support is changing from multiple repos to one repo per container image.
|
||||
|
||||
# [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
|
||||
[](https://discord.gg/YWrKVTn)
|
||||
[](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
|
||||
@@ -38,7 +32,7 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D
|
||||
|
||||
## Supported Architectures
|
||||
|
||||
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list).
|
||||
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||
|
||||
Simply pulling `linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||
|
||||
@@ -242,6 +236,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.
|
||||
|
||||
@@ -2,9 +2,9 @@ musl musl-1.1.19-r10
|
||||
busybox busybox-1.28.4-r3
|
||||
alpine-baselayout alpine-baselayout-3.1.0-r0
|
||||
alpine-keys alpine-keys-2.1-r1
|
||||
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0
|
||||
libressl2.7-libssl libressl2.7-libssl-2.7.4-r0
|
||||
libressl2.7-libtls libressl2.7-libtls-2.7.4-r0
|
||||
libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0
|
||||
libressl2.7-libssl libressl2.7-libssl-2.7.5-r0
|
||||
libressl2.7-libtls libressl2.7-libtls-2.7.5-r0
|
||||
ssl_client ssl_client-1.28.4-r3
|
||||
zlib zlib-1.2.11-r1
|
||||
apk-tools apk-tools-2.10.1-r0
|
||||
@@ -75,17 +75,17 @@ xvidcore xvidcore-1.3.4-r1
|
||||
ffmpeg-libs ffmpeg-libs-3.4.4-r1
|
||||
ffmpeg ffmpeg-3.4.4-r1
|
||||
gzip gzip-1.9-r0
|
||||
libcrypto1.0 libcrypto1.0-1.0.2q-r0
|
||||
libcrypto1.0 libcrypto1.0-1.0.2r-r0
|
||||
libdvbcsa libdvbcsa-1.1.0-r1
|
||||
libhdhomerun-libs libhdhomerun-libs-20161117-r1
|
||||
libssl1.0 libssl1.0-1.0.2q-r0
|
||||
libssl1.0 libssl1.0-1.0.2r-r0
|
||||
libva-intel-driver libva-intel-driver-2.1.0-r0
|
||||
libxml2 libxml2-2.9.8-r1
|
||||
libgpg-error libgpg-error-1.30-r0
|
||||
libgcrypt libgcrypt-1.8.3-r0
|
||||
libxslt libxslt-1.1.32-r0
|
||||
linux-headers linux-headers-4.4.6-r2
|
||||
openssl openssl-1.0.2q-r0
|
||||
openssl openssl-1.0.2r-r0
|
||||
pcre2 pcre2-10.31-r0
|
||||
perl perl-5.26.3-r0
|
||||
perl-archive-zip perl-archive-zip-1.60-r0
|
||||
@@ -209,7 +209,7 @@ perl-xml-writer perl-xml-writer-0.625-r2
|
||||
gdbm gdbm-1.13-r1
|
||||
sqlite-libs sqlite-libs-3.25.3-r0
|
||||
python2 python2-2.7.15-r1
|
||||
tar tar-1.31-r0
|
||||
tar tar-1.32-r0
|
||||
uriparser uriparser-0.8.5-r0
|
||||
wget wget-1.20.1-r0
|
||||
x264 x264-20180304-r1
|
||||
|
||||
@@ -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." }
|
||||
|
||||
7
root/defaults/config
Normal file
7
root/defaults/config
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"prefer_picon": true,
|
||||
"chiconpath": "file:///picons/%C.png",
|
||||
"piconpath": "file:///picons/",
|
||||
"piconscheme": 0,
|
||||
"chiconscheme": 2
|
||||
}
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user