Compare commits

..

146 Commits

Author SHA1 Message Date
LinuxServer-CI
f2423c1628 Bot Updating Package Versions 2019-12-28 02:34:07 +01:00
LinuxServer-CI
6a902e358e Bot Updating Templated Files 2019-12-28 01:06:03 +00:00
tobbenb
05e3e94c17 Forgot alot of shit 2019-12-27 17:05:03 -08:00
tobbenb
f69f0308e8 Update to Alpine 3.11 2019-12-27 17:05:03 -08:00
LinuxServer-CI
0aa53af054 Bot Updating Package Versions 2019-12-27 03:37:00 +00:00
LinuxServer-CI
8290519f1e Bot Updating Package Versions 2019-12-19 22:49:09 -05:00
LinuxServer-CI
99f9917b5f Bot Updating Templated Files 2019-11-28 21:17:02 +00:00
LinuxServer-CI
0922cf5d87 Bot Updating Package Versions 2019-11-15 04:50:09 +01:00
LinuxServer-CI
7bcfb3bdf2 Bot Updating Package Versions 2019-10-31 22:45:55 +01:00
LinuxServer-CI
f8a739bf42 Bot Updating Templated Files 2019-10-31 17:16:57 -04:00
thelamer
42d5564cea no need for dupe regex set 2019-10-19 15:32:55 -07:00
Bernhard Berger
f95217ed6d fix invalid random pattern for creation of groups (only lowercase + number allowed) 2019-10-19 15:32:55 -07:00
LinuxServer-CI
308e7be673 Bot Updating Package Versions 2019-10-18 17:00:20 -04:00
LinuxServer-CI
797285de84 Bot Updating Package Versions 2019-10-14 17:01:51 -04:00
LinuxServer-CI
8507c5fb2e Bot Updating Templated Files 2019-10-10 22:04:33 -04:00
LinuxServer-CI
c60559b46f Bot Updating Templated Files 2019-10-10 22:03:04 -04:00
aptalca
70b794cabc Improve permission fixing on render & dvb devices 2019-10-02 17:10:12 -04:00
LinuxServer-CI
9a7b46c55c Bot Updating Package Versions 2019-09-26 22:46:14 -04:00
LinuxServer-CI
48be429287 Bot Updating Package Versions 2019-09-20 03:36:48 +01:00
LinuxServer-CI
0cee1652df Bot Updating Package Versions 2019-09-05 22:48:01 -04:00
LinuxServer-CI
87a4772008 Bot Updating Templated Files 2019-09-06 03:04:00 +01:00
LinuxServer-CI
cd589b5edc Bot Updating Templated Files 2019-09-06 03:03:00 +01:00
LinuxServer-CI
7621f743f9 Bot Updating Package Versions 2019-08-29 22:29:53 -04:00
LinuxServer-CI
2c722cf6f5 Bot Updating Package Versions 2019-08-23 03:28:34 +01:00
LinuxServer-CI
fbe55624ba Bot Updating Package Versions 2019-08-18 15:38:08 -04:00
nRaecheR
05dfb9ffb3 Add support for hardware accelerated transcoding on AMD platforms (#129)
* Add support for hardware accelerated transcoding on AMD platforms

* #139 piggyback this PR to fix typo
2019-08-18 12:03:48 -07:00
LinuxServer-CI
ac4f7d401e Bot Updating Package Versions 2019-08-15 14:58:04 +01:00
LinuxServer-CI
ed43e439b6 Bot Updating Templated Files 2019-08-15 09:04:42 -04:00
aptalca
f406290afe Merge pull request #138 from anoma/master
Clarify Multicast requirement
2019-08-15 09:02:45 -04:00
anoma
7520004527 Merge pull request #1 from anoma/UDP-1900-wording
Clarify Multicast requirement
2019-08-15 06:49:27 +00:00
anoma
18489b187b Clarify Multicast requirement
Closes #100
2019-08-15 06:18:05 +00:00
aptalca
621a1dc880 fix video device permissions 2019-08-02 11:08:47 -07:00
LinuxServer-CI
c6d1618f97 Bot Updating Package Versions 2019-07-29 20:49:34 +00:00
LinuxServer-CI
7d62763012 Bot Updating Package Versions 2019-07-26 03:42:31 +01:00
LinuxServer-CI
22930512ea Bot Updating Package Versions 2019-07-18 22:42:50 -04:00
LinuxServer-CI
d97c1f1796 Bot Updating Package Versions 2019-07-05 21:17:04 +02:00
LinuxServer-CI
0ca518f159 Bot Updating Templated Files 2019-07-05 20:33:41 +02:00
chbmb
8cd7586acc Merge pull request #134 from linuxserver/master-3.10
Rebasing to Alpine 3.10
2019-07-05 19:32:34 +01:00
LinuxServer-CI
3b258e70bc Bot Updating Package Versions 2019-07-05 03:29:56 +01:00
LinuxServer-CI
41ebcd4ea6 Bot Updating Templated Files 2019-07-05 04:03:04 +02:00
LinuxServer-CI
343b9cd5f3 Bot Updating Package Versions 2019-06-30 23:24:59 +02:00
thelamer
33ab472fc7 Rebasing to Alpine 3.10 2019-06-28 19:02:10 -07:00
LinuxServer-CI
28b17930bd Bot Updating Package Versions 2019-06-07 03:29:45 +01:00
LinuxServer-CI
7a36e3fe54 Bot Updating Templated Files 2019-06-07 03:02:55 +01:00
LinuxServer-CI
bfaa13c92c Bot Updating Templated Files 2019-05-23 22:04:39 -04:00
LinuxServer-CI
19b809223d Bot Updating Templated Files 2019-05-23 22:03:07 -04:00
LinuxServer-CI
46a3cbb580 Bot Updating Package Versions 2019-05-17 04:30:16 +02:00
LinuxServer-CI
26b737c76c Bot Updating Package Versions 2019-05-10 02:38:20 +00:00
LinuxServer-CI
78d9a02ed1 Bot Updating Templated Files 2019-05-02 22:03:15 -04:00
LinuxServer-CI
58e666bbd5 Bot Updating Package Versions 2019-04-19 04:48:08 +02:00
LinuxServer-CI
fadee48d67 Bot Updating Package Versions 2019-04-12 02:30:47 +00:00
Ryan Kuba
0f9f1ef4d3 Extract Tarball on boot (#127)
* reworking logic to untar on first boot and reducing sample size for chown logic as it is not recursive

* bad path in arm variants
2019-03-28 22:53:57 +01:00
LinuxServer-CI
d052b13f92 Bot Updating Package Versions 2019-03-28 04:20:14 -04:00
Ryan Kuba
9d64ee4636 #72 fix chowning (#125)
* #72 only chown once using new logic, rebase to alpine 3.9, increase make threads now that arm boxes are single threaded

* typo
2019-03-28 08:02:54 +01:00
Ryan Kuba
753d0bbe38 Merge pull request #123 from thelamer/master
Switching to new Base images, shift to arm32v7 tag.
2019-03-24 17:10:02 -07:00
LinuxServer-CI
43b924159e Bot Updating Package Versions 2019-03-24 18:08:10 -04:00
LinuxServer-CI
09504f7d5b Bot Updating Templated Files 2019-03-24 21:16:32 +00:00
thelamer
31cd14f4f5 Switching to new Base images, shift to arm32v7 tag. 2019-03-23 22:17:41 -07:00
LinuxServer-CI
56a0b351da Bot Updating Package Versions 2019-03-20 22:33:57 +00:00
LinuxServer-CI
df82e31fe1 Bot Updating Package Versions 2019-03-08 00:58:39 +00:00
aptalca
6e137dbdba Merge pull request #120 from thelamer/master
libiconv shifted to community repos
2019-03-07 18:43:22 -05:00
thelamer
435875e2a3 libiconv shifted to community repos 2019-03-07 14:09:01 -08:00
LinuxServer-CI
6025ca0750 Bot Updating Templated Files 2019-03-07 16:16:49 -05:00
Rasmus
3a4ee7ab9f Bump xmltv to 0.6.1 (#118) 2019-03-02 15:15:33 +01:00
LinuxServer-CI
a2f49bb75b Bot Updating Package Versions 2019-03-01 22:19:05 +00:00
LinuxServer-CI
3659c4708a Bot Updating Templated Files 2019-03-01 16:35:30 -05:00
aptalca
8387285750 Merge pull request #117 from danofun/master
add perl-lwp-useragent-determined which is needed for tv_grab_zz_sdjson_sqlite
2019-03-01 16:34:31 -05:00
LinuxServer-CI
90d21b6f06 Bot Updating Templated Files 2019-03-01 16:16:43 -05:00
danofun
2631706f5b add changelog entry as requested. 2019-02-28 09:34:40 -05:00
danofun
f6e2be9d51 add perl-lwp-useragent 2019-02-27 21:21:15 -05:00
LinuxServer-CI
e6bb2a1641 Bot Updating Package Versions 2019-02-27 19:26:21 -05:00
LinuxServer-CI
a702166af3 Bot Updating Templated Files 2019-02-27 21:16:49 +00:00
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
j0nnymoe
dca4b0ed9b Merge pull request #107 from thelamer/master
adding dynamic readme
2019-02-12 14:34:48 +00:00
thelamer
8768cdb702 adding dynamic readme 2019-02-11 21:06:36 -08:00
LinuxServer-CI
002dda3027 Bot Updating Package Versions 2019-02-11 20:42:30 +00:00
LinuxServer-CI
3122624bf0 Bot Updating Templated Files 2019-02-11 19:24:31 +00:00
aptalca
0f717f40e4 Merge pull request #103 from linuxserver/pipeline
Remove Picons pipeline logic and multi arch
2019-02-11 14:23:46 -05:00
thelamer
548d5b2946 pulling picons from object storage during the build 2019-01-17 21:19:52 -08:00
thelamer
ef8f4a0dd0 removing picicons as they are included in the source repo and removing libva from arm variants 2019-01-16 16:14:39 -08:00
thelamer
a99f76a006 adding pipeline logic and multi arching 2019-01-16 01:51:19 -08:00
Homer
6e0fc5e84c Merge pull request #99 from iaselk/curlpipeperl
Add https for curl | perl used for cpanminus
2018-11-19 12:51:19 +00:00
axuttaja
417a24d0c2 add https for curl | perl used for cpanminus 2018-10-18 01:56:28 +03:00
aptalca
eb7c4bbefa Merge pull request #94 from linuxserver/rebase_alpine_3.8
rebase to alpine 3.8 and use buildstage type build
2018-09-12 15:30:34 -04:00
sparklyballs
c2250aa33f rebase to alpine 3.8 2018-09-12 15:48:43 +01:00
sparklyballs
80fea09e66 Update Dockerfile 2018-09-03 11:48:48 +01:00
sparklyballs
bd7ef42e33 rebase to alpine 3.8 and use buildstage type build 2018-09-02 13:33:35 +01:00
sparklyballs
c92cf86b86 rebase to alpine 3.8 and use buildstage type build 2018-09-02 13:33:03 +01:00
saarg
01c0439c90 Merge pull request #84 from linuxserver/xmltv
Add JSON::XS Perl package for grab_tv_huro
2018-04-21 21:00:12 +02:00
tobbenb
17ff5fcca4 Add JSON::XS Perl package for grab_tv_huro 2018-04-21 16:39:02 +02:00
saarg
0ddbdd0c08 Merge pull request #82 from linuxserver/dvbcsa
Add dvbcsa package
2018-03-24 11:17:24 +01:00
tobbenb
df6da18c15 Add dvbcsa package 2018-03-24 10:56:39 +01:00
sparklyballs
83f2893d22 Merge pull request #78 from linuxserver/use_sourceforge_master_xmltv
use sourceforge master rather than mirror for xmltv
2018-03-04 11:25:49 +00:00
sparklyballs
b41cde8174 copy pasta error 2018-03-04 09:31:38 +00:00
sparklyballs
a306c49d7a use sourceforge master rather than mirror for xmltv 2018-03-04 09:21:56 +00:00
sparklyballs
4af60c604c Merge pull request #77 from linuxserver/libva
Add lost libva-intel-driver
2018-02-23 13:06:49 +00:00
tobbenb
4288628824 Add lost libva-intel-driver 2018-02-22 22:01:17 +01:00
saarg
5d372c0e19 Merge pull request #74 from linuxserver/iconv
Fix wrong version of Iconv used.
2018-02-21 23:41:05 +01:00
tobbenb
6746a3fbf6 Update README and remove old patch file 2018-02-21 21:45:02 +01:00
tobbenb
0f99b9a0d5 Remove --cflags option left from testing 2018-02-21 19:02:37 +01:00
tobbenb
aa9724fdc2 Fix iconv runtime crash 2018-02-21 19:00:51 +01:00
sparklyballs
de493babb9 Update README.md 2018-02-18 21:21:40 +00:00
sparklyballs
0321b4d01a Merge pull request #73 from CvH/vaapi-support
Vaapi support
2018-02-18 21:12:07 +00:00
cvh
c0fe17d93e add vaapi to readme 2018-02-18 21:23:56 +01:00
cvh
b1a069a702 remove dvb-apps dependency
- Tvh ships now an own implementation
2018-02-18 21:23:54 +01:00
cvh
a68b5c32a4 add some build options
- disable-avahi to prevent error at buildlog
- disable-dbus_1 to prevent error at buildlog
- disable-bintray_cache to prevent known problems with that cache
- enable-trace to allow the usage of advanced debug functions (this is a devel branch)
2018-02-18 21:23:53 +01:00
cvh
880d45e6fe add png compression
- all pics at the help get compressed without viewable quality loss
2018-02-18 21:23:51 +01:00
cvh
a6a8e1b6d4 add vaapi support 2018-02-18 21:23:50 +01:00
sparklyballs
4d7daed6fc Merge pull request #67 from linuxserver/deprecate_cpu_core
deprecate cpu_core routine lack of scaling
2018-01-04 20:45:13 +00:00
sparklyballs
c15493ddbe deprecate cpu_core routine lack of scaling 2018-01-04 11:59:40 +00:00
sparklyballs
3dbea6d9a5 Merge pull request #63 from linuxserver/3.7
bump alpine 3.7, fix continuation lines, linting fixes
2017-12-11 13:52:46 +00:00
sparklyballs
d18eb4297c Update Dockerfile 2017-12-11 11:36:34 +00:00
sparklyballs
53ba6baa56 bump alpine 3.7, fix continuation lines, linting fixes 2017-12-11 11:19:37 +00:00
sparklyballs
0d9c4b8394 bump alpine 3.7, fix continuation lines, linting fixes 2017-12-11 11:16:09 +00:00
aptalca
3a054b8a57 Merge pull request #62 from linuxserver/x264_fix
add codec dependencies
2017-09-01 21:23:11 -04:00
sparklyballs
6d486e90d0 add codec dependencies 2017-09-02 00:16:44 +01:00
aptalca
4aeef6554b Merge pull request #60 from linuxserver/config_patches
increased uniformity across all archs
2017-07-13 20:27:40 -04:00
sparklyballs
2e0e6d028c increased uniformity across all archs 2017-07-13 20:17:36 +01:00
sparklyballs
d4fb416e62 correct label tags 2017-07-12 15:51:58 +01:00
sparklyballs
51f45f4d30 update of README with badges for new ci 2017-07-11 09:36:12 +01:00
sparklyballs
6a4d853235 Merge pull request #58 from linuxserver/readme-master
Update README with full path for comskip
2017-07-09 12:25:44 +01:00
tobbenb
0b1069a088 Update README with full path for comskip 2017-07-08 12:26:54 +02:00
sparklyballs
c9181d7131 Update README.md 2017-07-03 12:22:17 +01:00
j0nnymoe
9a3b13ad27 Merge pull request #56 from linuxserver/readme
Update README with new branch
2017-07-03 12:15:49 +01:00
sparklyballs
bdc1f87ac6 tidy up dockerfile edit README with changes to release branch 2017-07-03 12:05:15 +01:00
sparklyballs
e4e07121af tidy up Dockerfile and use only one install run for runtime packages 2017-07-03 11:34:18 +01:00
sparklyballs
0e8ea6063c change branch for release 4.2 2017-07-02 16:03:09 +01:00
tobbenb
9b161c87f9 Update README with new branch 2017-07-02 16:50:26 +02:00
saarg
ec6ff1a886 Merge pull request #54 from linuxserver/alpine_3.6
bump to alpine 3.6
2017-05-28 16:12:13 +02:00
sparklyballs
87d4b9c811 remove unneeded ffmpeg variable 2017-05-28 02:34:06 +01:00
sparklyballs
0d53fe87a0 add pcre2 dependency 2017-05-27 23:52:54 +01:00
sparklyballs
314f59a89f bump to alpine 3.6 2017-05-27 23:37:20 +01:00
j0nnymoe
4e44306b81 Merge pull request #53 from linuxserver/README_edits
"placeholder" image to fix broken link, add missing image version info
2017-05-11 10:46:09 +01:00
sparklyballs
68a5beb2ce "placeholder" image to fix broken link, add missing image version info 2017-05-11 07:43:55 +01:00
j0nnymoe
9ce7af875d Merge pull request #52 from linuxserver/fix_duplicates_dockerfile
fix duplicates in Dockerfile, some spacing issues
2017-05-09 15:58:20 +01:00
sparklyballs
51e21fbae9 fix duplicates in Dockerfile, some spacing issues 2017-05-09 11:48:56 +01:00
sparklyballs
97ed2af733 use readme from 4.2.1 branch 2017-05-01 14:01:38 +01:00
11 changed files with 446 additions and 289 deletions

View File

@@ -1,14 +1,13 @@
FROM lsiobase/alpine:3.10 as buildstage
FROM lsiobase/alpine:3.11 as buildstage
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG TVH_VER="release/4.2"
ARG XMLTV_VER="v0.5.70"
ARG TVHEADEND_COMMIT
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
@@ -32,16 +31,18 @@ RUN \
git \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libressl-dev \
libtool \
libva-dev \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
mercurial \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
@@ -77,6 +78,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -118,7 +120,7 @@ RUN \
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L http://cpanmin.us | perl - App::cpanminus && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
@@ -126,6 +128,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
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 && \
@@ -139,41 +143,44 @@ RUN \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile dvb-apps ****" && \
hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
cd /tmp/dvb-apps && \
make -C lib && \
make -C lib DESTDIR=/tmp/dvbapps-build install && \
cp -pr /tmp/dvbapps-build/usr/* /usr/
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
/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 \
--disable-dbus_1 \
`#Encoding` \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
--disable-libfdkaac_static \
--disable-libmfx_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--enable-vaapi \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
@@ -215,7 +222,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:3.10
FROM lsiobase/alpine:3.11
# set version label
ARG BUILD_DATE
@@ -236,14 +243,18 @@ RUN \
ffmpeg-libs \
gzip \
libcrypto1.1 \
libcurl \
libcurl \
libdvbcsa \
libhdhomerun-libs \
libressl \
libssl1.1 \
libva \
libva-intel-driver \
mesa-dri-ati \
libvpx \
libxml2 \
libxslt \
linux-headers \
openssl \
opus \
pcre2 \
perl \
@@ -278,6 +289,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -317,7 +329,6 @@ RUN \
# copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
@@ -326,4 +337,4 @@ COPY root/ /
# ports and volumes
EXPOSE 9981 9982
VOLUME /config /recordings
VOLUME /config

View File

@@ -1,14 +1,13 @@
FROM lsiobase/alpine:arm64v8-3.10 as buildstage
FROM lsiobase/alpine:arm64v8-3.11 as buildstage
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG TVH_VER="release/4.2"
ARG XMLTV_VER="v0.5.70"
ARG TVHEADEND_COMMIT
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
@@ -32,16 +31,17 @@ RUN \
git \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libressl-dev \
libtool \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
mercurial \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
@@ -77,6 +77,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -118,7 +119,7 @@ RUN \
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L http://cpanmin.us | perl - App::cpanminus && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
@@ -126,6 +127,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
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 && \
@@ -139,19 +142,11 @@ RUN \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile dvb-apps ****" && \
hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
cd /tmp/dvb-apps && \
make -C lib && \
make -C lib DESTDIR=/tmp/dvbapps-build install && \
cp -pr /tmp/dvbapps-build/usr/* /usr/
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
| jq -r '. | .sha'); \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
@@ -159,21 +154,31 @@ RUN \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
./configure \
--disable-avahi \
--disable-bintray_cache \
--disable-dbus_1 \
`#Encoding` \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
--disable-libfdkaac_static \
--disable-libmfx_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
@@ -215,7 +220,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:arm64v8-3.10
FROM lsiobase/alpine:arm64v8-3.11
# set version label
ARG BUILD_DATE
@@ -236,14 +241,15 @@ RUN \
ffmpeg-libs \
gzip \
libcrypto1.1 \
libcurl \
libcurl \
libdvbcsa \
libhdhomerun-libs \
libressl \
libssl1.1 \
libvpx \
libxml2 \
libxslt \
linux-headers \
openssl \
opus \
pcre2 \
perl \
@@ -278,6 +284,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -317,7 +324,6 @@ RUN \
# copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
@@ -326,4 +332,4 @@ COPY root/ /
# ports and volumes
EXPOSE 9981 9982
VOLUME /config /recordings
VOLUME /config

View File

@@ -1,14 +1,13 @@
FROM lsiobase/alpine:arm32v7-3.10 as buildstage
FROM lsiobase/alpine:arm32v7-3.11 as buildstage
############## build stage ##############
# package versions
ARG ARGTABLE_VER="2.13"
ARG TVH_VER="release/4.2"
ARG XMLTV_VER="v0.5.70"
ARG TVHEADEND_COMMIT
ARG XMLTV_VER="v0.6.1"
# environment settings
ARG TZ="Europe/Oslo"
ARG TVHEADEND_COMMIT
ENV HOME="/config"
# copy patches
@@ -32,16 +31,17 @@ RUN \
git \
gzip \
jq \
libcurl \
libdvbcsa-dev \
libgcrypt-dev \
libhdhomerun-dev \
libressl-dev \
libtool \
libvpx-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
mercurial \
openssl-dev \
opus-dev \
patch \
pcre2-dev \
@@ -77,6 +77,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -118,7 +119,7 @@ RUN \
RUN \
echo "**** install perl modules for xmltv ****" && \
curl -L http://cpanmin.us | perl - App::cpanminus && \
curl -L https://cpanmin.us | perl - App::cpanminus && \
cpanm --installdeps /tmp/patches
RUN \
@@ -126,6 +127,8 @@ RUN \
git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
cd /tmp/xmltv && \
git checkout ${XMLTV_VER} && \
echo "**** Fix test for xmltv alpine 3.11 ****" && \
patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
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 && \
@@ -139,19 +142,11 @@ RUN \
make test && \
make DESTDIR=/tmp/xmltv-build install
RUN \
echo "**** compile dvb-apps ****" && \
hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
cd /tmp/dvb-apps && \
make -C lib && \
make -C lib DESTDIR=/tmp/dvbapps-build install && \
cp -pr /tmp/dvbapps-build/usr/* /usr/
RUN \
echo "**** compile tvheadend ****" && \
if [ -z ${TVHEADEND_COMMIT+x} ]; then \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
| jq -r '. | .sha'); \
TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p \
/tmp/tvheadend && \
@@ -159,21 +154,31 @@ RUN \
cd /tmp/tvheadend && \
git checkout ${TVHEADEND_COMMIT} && \
./configure \
--disable-avahi \
--disable-bintray_cache \
--disable-dbus_1 \
`#Encoding` \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
--disable-libfdkaac_static \
--disable-libmfx_static \
--disable-libtheora_static \
--disable-libopus_static \
--disable-libvorbis_static \
--disable-libvpx_static \
--disable-libx264_static \
--disable-libx265_static \
--disable-libfdkaac \
--enable-libopus \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
\
`#Options` \
--disable-avahi \
--disable-dbus_1 \
--disable-bintray_cache \
--disable-hdhomerun_static \
--enable-hdhomerun_client \
--enable-libav \
--enable-pngquant \
--enable-trace \
--infodir=/usr/share/info \
--localstatedir=/var \
--mandir=/usr/share/man \
@@ -215,7 +220,7 @@ RUN \
make DESTDIR=/tmp/comskip-build install
############## runtime stage ##############
FROM lsiobase/alpine:arm32v7-3.10
FROM lsiobase/alpine:arm32v7-3.11
# set version label
ARG BUILD_DATE
@@ -236,14 +241,15 @@ RUN \
ffmpeg-libs \
gzip \
libcrypto1.1 \
libcurl \
libcurl \
libdvbcsa \
libhdhomerun-libs \
libressl \
libssl1.1 \
libvpx \
libxml2 \
libxslt \
linux-headers \
openssl \
opus \
pcre2 \
perl \
@@ -278,6 +284,7 @@ RUN \
perl-lingua-en-numbers-ordinate \
perl-lingua-preferred \
perl-list-moreutils \
perl-lwp-useragent-determined \
perl-module-build \
perl-module-pluggable \
perl-net-ssleay \
@@ -317,7 +324,6 @@ RUN \
# copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
@@ -326,4 +332,4 @@ COPY root/ /
# ports and volumes
EXPOSE 9981 9982
VOLUME /config /recordings
VOLUME /config

200
Jenkinsfile vendored
View File

@@ -14,7 +14,9 @@ pipeline {
environment {
BUILDS_DISCORD=credentials('build_webhook_url')
GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
EXT_GIT_BRANCH = 'release/4.2'
GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
EXT_GIT_BRANCH = 'master'
EXT_USER = 'tvheadend'
EXT_REPO = 'tvheadend'
BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
@@ -42,7 +44,7 @@ pipeline {
script{
env.EXIT_STATUS = ''
env.LS_RELEASE = sh(
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':release-4.2 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
returnStdout: true).trim()
env.LS_RELEASE_NOTES = sh(
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -127,15 +129,18 @@ pipeline {
}
}
}
// If this is a release-4.2 build use live docker endpoints
// If this is a master build use live docker endpoints
stage("Set ENV live build"){
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
}
steps {
script{
env.IMAGE = env.DOCKERHUB_IMAGE
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
} else {
@@ -148,12 +153,15 @@ pipeline {
// If this is a dev build use dev docker endpoints
stage("Set ENV dev build"){
when {
not {branch "release-4.2"}
not {branch "master"}
environment name: 'CHANGE_ID', value: ''
}
steps {
script{
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
} else {
@@ -172,6 +180,9 @@ pipeline {
steps {
script{
env.IMAGE = env.PR_DOCKERHUB_IMAGE
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
} else {
@@ -215,7 +226,7 @@ pipeline {
// Use helper containers to render templated files
stage('Update-Templates') {
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
expression {
env.CONTAINER_NAME != null
@@ -226,7 +237,7 @@ pipeline {
set -e
TEMPDIR=$(mktemp -d)
docker pull linuxserver/jenkins-builder:latest
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -234,7 +245,7 @@ pipeline {
mkdir -p ${TEMPDIR}/repo
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
cd ${TEMPDIR}/repo/${LS_REPO}
git checkout -f release-4.2
git checkout -f master
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
@@ -266,7 +277,7 @@ pipeline {
// Exit the build if the Templated files were just updated
stage('Template-exit') {
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
environment name: 'FILES_UPDATED', value: 'true'
expression {
@@ -279,6 +290,26 @@ pipeline {
}
}
}
/* #######################
GitLab Mirroring
####################### */
// Ping into Gitlab to mirror this repo and have a registry endpoint
stage("GitLab Mirror"){
when {
environment name: 'EXIT_STATUS', value: ''
}
steps{
sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-d '{"namespace_id":'${GITLAB_NAMESPACE}',\
"name":"'${LS_REPO}'",
"mirror":true,\
"import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
"issues_access_level":"disabled",\
"merge_requests_access_level":"disabled",\
"repository_access_level":"enabled",\
"visibility":"public"}' '''
}
}
/* ###############
Build Container
############### */
@@ -365,7 +396,7 @@ pipeline {
// Take the image we just built and dump package versions for comparison
stage('Update-packages') {
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
environment name: 'EXIT_STATUS', value: ''
}
@@ -393,7 +424,7 @@ pipeline {
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f release-4.2
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
cd ${TEMPDIR}/${LS_REPO}/
wait
@@ -417,7 +448,7 @@ pipeline {
// Exit the build if the package file was just updated
stage('PACKAGE-exit') {
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
environment name: 'PACKAGE_UPDATED', value: 'true'
environment name: 'EXIT_STATUS', value: ''
@@ -431,7 +462,7 @@ pipeline {
// Exit the build if this is just a package check and there are no changes to push
stage('PACKAGECHECK-exit') {
when {
branch "release-4.2"
branch "master"
environment name: 'CHANGE_ID', value: ''
environment name: 'PACKAGE_UPDATED', value: 'false'
environment name: 'EXIT_STATUS', value: ''
@@ -510,19 +541,32 @@ pipeline {
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
usernameVariable: 'DOCKERUSER',
passwordVariable: 'DOCKERPASS'
],
[
$class: 'UsernamePasswordMultiBinding',
credentialsId: 'Quay.io-Robot',
usernameVariable: 'QUAYUSER',
passwordVariable: 'QUAYPASS'
]
]) {
echo 'Logging into DockerHub'
sh '''#! /bin/bash
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
set -e
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
docker push ${PUSHIMAGE}:latest
docker push ${PUSHIMAGE}:${META_TAG}
done
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
docker rmi \
${DELETEIMAGE}:${META_TAG} \
${DELETEIMAGE}:latest || :
done
'''
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:release-4.2"
sh "docker push ${IMAGE}:release-4.2"
sh "docker push ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:${META_TAG} \
${IMAGE}:release-4.2 || :'''
}
}
}
@@ -539,53 +583,88 @@ pipeline {
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
usernameVariable: 'DOCKERUSER',
passwordVariable: 'DOCKERPASS'
],
[
$class: 'UsernamePasswordMultiBinding',
credentialsId: 'Quay.io-Robot',
usernameVariable: 'QUAYUSER',
passwordVariable: 'QUAYPASS'
]
]) {
sh '''#! /bin/bash
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
'''
sh '''#! /bin/bash
set -e
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
if [ "${CI}" == "false" ]; then
docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi'''
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-release-4.2"
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-release-4.2"
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-release-4.2"
sh "docker push ${IMAGE}:amd64-${META_TAG}"
sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
sh "docker push ${IMAGE}:amd64-release-4.2"
sh "docker push ${IMAGE}:arm32v7-release-4.2"
sh "docker push ${IMAGE}:arm64v8-release-4.2"
sh "docker manifest push --purge ${IMAGE}:release-4.2 || :"
sh "docker manifest create ${IMAGE}:release-4.2 ${IMAGE}:amd64-release-4.2 ${IMAGE}:arm32v7-release-4.2 ${IMAGE}:arm64v8-release-4.2"
sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm32v7-release-4.2 --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm64v8-release-4.2 --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
sh "docker manifest push --purge ${IMAGE}:release-4.2"
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
sh '''docker rmi \
${IMAGE}:amd64-${META_TAG} \
${IMAGE}:amd64-release-4.2 \
${IMAGE}:arm32v7-${META_TAG} \
${IMAGE}:arm32v7-release-4.2 \
${IMAGE}:arm64v8-${META_TAG} \
${IMAGE}:arm64v8-release-4.2 \
fi
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker push ${MANIFESTIMAGE}:amd64-latest
docker push ${MANIFESTIMAGE}:arm32v7-latest
docker push ${MANIFESTIMAGE}:arm64v8-latest
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:latest
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
done
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
docker push ${LEGACYIMAGE}:latest
docker push ${LEGACYIMAGE}:${META_TAG}
docker push ${LEGACYIMAGE}:arm32v7-latest
docker push ${LEGACYIMAGE}:arm64v8-latest
done
'''
sh '''#! /bin/bash
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker rmi \
${DELETEIMAGE}:amd64-${META_TAG} \
${DELETEIMAGE}:amd64-latest \
${DELETEIMAGE}:arm32v7-${META_TAG} \
${DELETEIMAGE}:arm32v7-latest \
${DELETEIMAGE}:arm64v8-${META_TAG} \
${DELETEIMAGE}:arm64v8-latest || :
done
docker rmi \
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
'''
}
}
}
// If this is a public release tag it in the LS Github
stage('Github-Tag-Push-Release') {
when {
branch "release-4.2"
branch "master"
expression {
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
}
@@ -597,17 +676,17 @@ pipeline {
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"object": "'${COMMIT_SHA}'",\
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to release-4.2",\
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
"type": "commit",\
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
echo "Pushing New release for Tag"
sh '''#! /bin/bash
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"target_commitish": "release-4.2",\
"target_commitish": "master",\
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
printf '","draft": false,"prerelease": true}' >> releasebody.json
printf '","draft": false,"prerelease": false}' >> releasebody.json
paste -d'\\0' start releasebody.json > releasebody.json.done
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
}
@@ -662,16 +741,19 @@ pipeline {
sh 'echo "build aborted"'
}
else if (currentBuild.currentResult == "SUCCESS"){
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
}
else {
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
}
}
}
cleanup {
cleanWs()
}
}
}

View File

@@ -4,8 +4,8 @@
[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
@@ -20,15 +20,19 @@ Find us at:
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
# [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-tvheadend/releases)
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend)
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend/releases)
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend/packages)
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-tvheadend/container_registry)
[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/tvheadend)
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/tvheadend)
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)
@@ -82,14 +86,15 @@ docker create \
-v <path to data>:/config \
-v <path to recordings>:/recordings \
--device /dev/dri:/dev/dri `#optional` \
--device /dev/drb:/dev/dvb `#optional` \
--device /dev/dvb:/dev/dvb `#optional` \
--restart unless-stopped \
linuxserver/tvheadend
```
#### Host vs. Bridge
If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
### docker-compose
@@ -116,7 +121,7 @@ services:
- 9982:9982
devices:
- /dev/dri:/dev/dri #optional
- /dev/drb:/dev/dvb #optional
- /dev/dvb:/dev/dvb #optional
restart: unless-stopped
```
@@ -137,6 +142,18 @@ Container images are configured using parameters passed at runtime (such as thos
| `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
| `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |
## Environment variables from files (Docker secrets)
You can set any environment variable from a file by using a special prepend `FILE__`.
As an example:
```
-e FILE__PASSWORD=/run/secrets/mysecretpassword
```
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
## User / Group Identifiers
When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -278,11 +295,15 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **02.10.19:** - Improve permissions fixing on render & dvb devices.
* **27.12.19:** - Update to Alpine 3.11.
* **02.10.19:** - Improve permission fixing on render & dvb devices.
* **18.08.19:** - Add AMD drivers.
* **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
* **28.06.19:** - Rebasing to alpine 3.10.
* **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
* **01.03.19:** - Bump xmltv to 0.6.1.
* **28.02.19:** - add perl-lwp-useragent-determined.
* **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.

View File

@@ -3,11 +3,11 @@
# jenkins variables
project_name: docker-tvheadend
external_type: github_commit
release_type: prerelease
release_tag: release-4.2
ls_branch: release-4.2
release_type: stable
release_tag: latest
ls_branch: master
repo_vars:
- EXT_GIT_BRANCH = 'release/4.2'
- EXT_GIT_BRANCH = 'master'
- EXT_USER = 'tvheadend'
- EXT_REPO = 'tvheadend'
- BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'

View File

@@ -1,108 +1,113 @@
alpine-baselayout-3.1.2-r0
alpine-baselayout-3.2.0-r3
alpine-keys-2.1-r2
alsa-lib-1.1.9-r0
apk-tools-2.10.4-r2
bash-5.0.0-r0
bsd-compat-headers-0.7.1-r0
busybox-1.30.1-r2
bzip2-1.0.6-r7
ca-certificates-20190108-r0
ca-certificates-cacert-20190108-r0
alsa-lib-1.2.1.2-r0
apk-tools-2.10.4-r3
bash-5.0.11-r1
bsd-compat-headers-0.7.2-r0
busybox-1.31.1-r8
bzip2-1.0.8-r1
ca-certificates-20191127-r0
ca-certificates-cacert-20191127-r0
coreutils-8.31-r0
curl-7.66.0-r0
expat-2.2.8-r0
ffmpeg-4.1.4-r0
ffmpeg-libs-4.1.4-r0
fontconfig-2.13.1-r0
freetype-2.10.0-r0
fribidi-1.0.5-r1
curl-7.67.0-r0
elfutils-libelf-0.168-r2
expat-2.2.9-r1
ffmpeg-4.2.1-r3
ffmpeg-libs-4.2.1-r3
fontconfig-2.13.1-r2
freetype-2.10.1-r0
fribidi-1.0.8-r0
gdbm-1.13-r1
gmp-6.1.2-r1
gnu-libiconv-1.15-r2
gnutls-3.6.8-r0
gnutls-3.6.10-r0
gzip-1.10-r0
lame-3.100-r0
libacl-2.2.52-r6
libacl-2.2.53-r0
libass-0.14.0-r0
libattr-2.4.48-r0
libbsd-0.9.1-r0
libbz2-1.0.6-r7
libc-utils-0.7.1-r0
libcrypto1.1-1.1.1d-r0
libcurl-7.66.0-r0
libdrm-2.4.98-r0
libbsd-0.10.0-r0
libbz2-1.0.8-r1
libc-utils-0.7.2-r0
libcrypto1.1-1.1.1d-r3
libcurl-7.67.0-r0
libdrm-2.4.100-r0
libdvbcsa-1.1.0-r1
libffi-3.2.1-r6
libgcc-8.3.0-r0
libgcc-9.2.0-r3
libgcrypt-1.8.5-r0
libgpg-error-1.36-r2
libhdhomerun-libs-20161117-r1
libhdhomerun-libs-20190621-r0
libidn-1.35-r0
libjpeg-turbo-2.0.2-r0
libogg-1.3.3-r2
libpciaccess-0.14-r0
libjpeg-turbo-2.0.3-r0
libogg-1.3.4-r0
libpciaccess-0.16-r0
libpng-1.6.37-r1
libressl-2.7.5-r0
libressl2.7-libcrypto-2.7.5-r0
libressl2.7-libssl-2.7.5-r0
libressl2.7-libtls-2.7.5-r0
libssl1.1-1.1.1d-r0
libstdc++-8.3.0-r0
libtasn1-4.14-r0
libssl1.1-1.1.1d-r3
libstdc++-9.2.0-r3
libtasn1-4.15.0-r0
libtheora-1.1.1-r14
libtls-standalone-2.9.1-r0
libunistring-0.9.10-r0
liburiparser-0.9.3-r0
libuuid-2.33.2-r0
libva-2.4.1-r0
libvdpau-1.2-r0
libuuid-2.34-r1
libva-2.6.0-r0
libva-intel-driver-2.4.0-r0
libvdpau-1.3-r0
libvorbis-1.3.6-r2
libvpx-1.8.0-r0
libx11-1.6.8-r1
libvpx-1.8.1-r0
libx11-1.6.9-r0
libxau-1.0.9-r0
libxcb-1.13.1-r0
libxdmcp-1.1.3-r0
libxext-1.3.4-r0
libxfixes-5.0.3-r2
libxml2-2.9.9-r2
libxslt-1.1.33-r1
libxml2-2.9.10-r1
libxshmfence-1.3-r0
libxslt-1.1.34-r0
linux-headers-4.19.36-r0
linux-pam-1.3.0-r1
musl-1.1.22-r3
musl-utils-1.1.22-r3
ncurses-libs-6.1_p20190518-r0
ncurses-terminfo-6.1_p20190518-r0
ncurses-terminfo-base-6.1_p20190518-r0
nettle-3.4.1-r1
nghttp2-libs-1.39.2-r0
linux-pam-1.3.1-r1
llvm9-libs-9.0.0-r1
mesa-19.2.7-r0
mesa-dri-ati-19.2.7-r0
mesa-glapi-19.2.7-r0
musl-1.1.24-r0
musl-utils-1.1.24-r0
ncurses-libs-6.1_p20191130-r0
ncurses-terminfo-6.1_p20191130-r0
ncurses-terminfo-base-6.1_p20191130-r0
nettle-3.5.1-r0
nghttp2-libs-1.40.0-r0
openssl-1.1.1d-r3
opus-1.3.1-r0
p11-kit-0.23.16.1-r0
pcre2-10.33-r0
perl-5.28.2-r1
perl-archive-zip-1.64-r0
p11-kit-0.23.18.1-r0
pcre2-10.34-r1
perl-5.30.1-r0
perl-archive-zip-1.67-r0
perl-b-hooks-endofscope-0.24-r0
perl-boolean-0.46-r0
perl-capture-tiny-0.48-r0
perl-cgi-4.44-r0
perl-class-data-inheritable-0.08-r0
perl-class-inspector-1.34-r0
perl-class-methodmaker-2.24-r3
perl-class-inspector-1.36-r0
perl-class-methodmaker-2.24-r4
perl-class-singleton-1.5-r0
perl-compress-raw-bzip2-2.086-r1
perl-compress-raw-zlib-2.086-r1
perl-compress-raw-bzip2-2.093-r0
perl-compress-raw-zlib-2.093-r0
perl-cpan-meta-check-0.014-r0
perl-data-dumper-2.173-r1
perl-date-manip-6.77-r0
perl-datetime-1.51-r0
perl-data-dumper-2.173-r3
perl-date-manip-6.79-r0
perl-datetime-1.51-r1
perl-datetime-format-strptime-1.76-r0
perl-datetime-locale-1.23-r0
perl-datetime-timezone-2.19-r0
perl-dbd-sqlite-1.62-r1
perl-dbi-1.642-r1
perl-datetime-locale-1.25-r0
perl-datetime-timezone-2.38-r0
perl-dbd-sqlite-1.64-r1
perl-dbi-1.642-r2
perl-devel-stacktrace-2.04-r0
perl-devel-symdump-2.18-r0
perl-digest-sha1-2.13-r10
perl-digest-sha1-2.13-r11
perl-dist-checkconflicts-0.11-r0
perl-doc-5.28.2-r1
perl-doc-5.30.1-r0
perl-encode-locale-1.05-r1
perl-eval-closure-0.14-r0
perl-exception-class-1.44-r0
@@ -110,111 +115,112 @@ perl-exporter-tiny-1.002001-r0
perl-file-listing-6.04-r1
perl-file-sharedir-1.116-r0
perl-file-sharedir-install-0.13-r0
perl-file-slurp-9999.27-r0
perl-file-slurp-9999.29-r0
perl-file-temp-0.2309-r0
perl-file-which-1.23-r0
perl-getopt-long-2.50-r0
perl-html-parser-3.72-r3
perl-getopt-long-2.51-r0
perl-html-parser-3.72-r4
perl-html-tagset-3.20-r1
perl-html-tree-5.07-r0
perl-http-cookies-6.04-r0
perl-http-daemon-6.01-r1
perl-http-date-6.02-r1
perl-http-cookies-6.08-r0
perl-http-daemon-6.06-r0
perl-http-date-6.05-r0
perl-http-message-6.18-r0
perl-http-negotiate-6.01-r1
perl-importer-0.025-r0
perl-io-1.25-r5
perl-io-compress-2.086-r0
perl-io-html-1.001-r1
perl-io-socket-ssl-2.060-r0
perl-io-stringy-2.111-r1
perl-ipc-run3-0.048-r0
perl-json-2.97000-r0
perl-libwww-6.39-r1
perl-io-1.39-r0
perl-io-compress-2.093-r0
perl-io-html-1.001-r2
perl-io-socket-ssl-2.066-r0
perl-io-stringy-2.112-r0
perl-ipc-run3-0.048-r1
perl-json-4.02-r0
perl-libwww-6.43-r0
perl-lingua-en-numbers-ordinate-1.04-r1
perl-lingua-preferred-0.2.4-r1
perl-list-moreutils-0.428-r0
perl-list-moreutils-xs-0.428-r1
perl-list-moreutils-xs-0.428-r2
perl-lwp-mediatypes-6.04-r0
perl-lwp-useragent-determined-1.07-r0
perl-module-build-0.4229-r0
perl-module-implementation-0.09-r1
perl-module-metadata-1.000036-r0
perl-module-metadata-1.000037-r0
perl-module-pluggable-5.2-r0
perl-module-runtime-0.016-r2
perl-mro-compat-0.13-r0
perl-namespace-autoclean-0.28-r0
perl-namespace-autoclean-0.29-r0
perl-namespace-clean-0.27-r0
perl-net-http-6.19-r0
perl-net-libidn-0.12-r6
perl-net-ssleay-1.85-r5
perl-net-libidn-0.12-r7
perl-net-ssleay-1.88-r0
perl-package-deprecationmanager-0.17-r0
perl-package-stash-0.38-r1
perl-package-stash-xs-0.29-r1
perl-params-util-1.07-r6
perl-params-validate-1.29-r1
perl-params-validationcompiler-0.27-r0
perl-package-stash-xs-0.29-r2
perl-params-util-1.07-r7
perl-params-validate-1.29-r2
perl-params-validationcompiler-0.30-r0
perl-parse-recdescent-1.967015-r1
perl-path-class-0.37-r0
perl-pod-coverage-0.23-r0
perl-role-tiny-2.000006-r0
perl-scalar-list-utils-1.50-r1
perl-role-tiny-2.001004-r0
perl-scalar-list-utils-1.53-r1
perl-scope-guard-0.21-r0
perl-specio-0.42-r0
perl-specio-0.45-r0
perl-sub-exporter-progressive-0.001013-r0
perl-sub-identify-0.14-r2
perl-sub-identify-0.14-r3
perl-sub-info-0.002-r0
perl-sub-install-0.928-r0
perl-sub-name-0.21-r2
perl-sub-quote-2.004000-r0
perl-sub-name-0.26-r0
perl-sub-quote-2.006006-r0
perl-sub-uplevel-0.2800-r0
perl-term-progressbar-2.22-r0
perl-term-readkey-2.38-r1
perl-term-table-0.012-r0
perl-term-readkey-2.38-r2
perl-term-table-0.015-r0
perl-test-exception-0.43-r0
perl-test-fatal-0.014-r1
perl-test-needs-0.002005-r1
perl-test-needs-0.002006-r0
perl-test-pod-1.52-r0
perl-test-requires-0.10-r0
perl-test-simple-1.302164-r0
perl-test-taint-1.08-r0
perl-test-warnings-0.026-r0
perl-test-simple-1.302170-r0
perl-test-taint-1.08-r1
perl-test-warnings-0.027-r0
perl-test-without-module-0.20-r0
perl-test2-plugin-nowarnings-0.07-r0
perl-test2-suite-0.000122-r0
perl-test2-plugin-nowarnings-0.08-r0
perl-test2-suite-0.000127-r0
perl-timedate-2.30-r1
perl-try-tiny-0.30-r1
perl-unicode-string-2.09-r7
perl-unicode-string-2.10-r1
perl-uri-1.76-r0
perl-variable-magic-0.62-r1
perl-variable-magic-0.62-r2
perl-www-robotrules-6.02-r1
perl-xml-libxml-2.0134-r2
perl-xml-libxslt-1.96-r1
perl-xml-libxml-2.0134-r3
perl-xml-libxslt-1.96-r2
perl-xml-namespacesupport-1.12-r0
perl-xml-parser-2.44-r5
perl-xml-sax-0.99-r2
perl-xml-parser-2.46-r0
perl-xml-sax-1.02-r0
perl-xml-sax-base-1.09-r0
perl-xml-treepp-0.43-r1
perl-xml-twig-3.52-r1
perl-xml-writer-0.625-r2
perl-yaml-syck-1.31-r1
python2-2.7.16-r1
readline-8.0.0-r0
scanelf-1.2.3-r0
perl-yaml-syck-1.31-r2
python2-2.7.16-r3
readline-8.0.1-r0
scanelf-1.2.4-r0
sdl2-2.0.10-r0
shadow-4.6-r2
sqlite-libs-3.28.0-r1
ssl_client-1.30.1-r2
tar-1.32-r0
shadow-4.7-r1
sqlite-libs-3.30.1-r1
ssl_client-1.31.1-r8
tar-1.32-r1
tzdata-2019c-r0
uriparser-0.9.3-r0
v4l-utils-libs-1.16.6-r0
v4l-utils-libs-1.18.0-r0
wayland-libs-client-1.17.0-r0
wget-1.20.3-r0
x264-20180304-r1
x264-libs-20180304-r1
x265-3.0-r0
x265-libs-3.0-r0
xvidcore-1.3.4-r1
x264-20191119-r0
x264-libs-20191119-r0
x265-3.2.1-r0
x265-libs-3.2.1-r0
xvidcore-1.3.5-r0
xz-5.2.4-r0
xz-libs-5.2.4-r0
zlib-1.2.11-r1
zlib-1.2.11-r3

View File

@@ -0,0 +1,20 @@
---
t/test_tv_imdb.t | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
index ad504464..4dc281a1 100755
--- a/t/test_tv_imdb.t
+++ b/t/test_tv_imdb.t
@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
# Make temporary directory and split into it.
- my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+ my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
if ( $input=~m/movies-only/ ) {
- $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+ $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
}
#print STDERR "\nRUN:$cmd\n";
my $r = system($cmd);

View File

@@ -53,14 +53,15 @@ opt_param_usage_include_ports: false
opt_param_device_map: true
opt_param_devices:
- { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi)." }
- { device_path: "/dev/dvb", device_host_path: "/dev/drb", desc: "Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out." }
- { device_path: "/dev/dvb", device_host_path: "/dev/dvb", desc: "Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out." }
opt_cap_add_param: false
optional_block_1: true
optional_block_1_items:
- |
#### Host vs. Bridge
If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
# application setup block
app_setup_block_enabled: true
@@ -125,11 +126,15 @@ app_setup_block: |
# changelog
changelogs:
- { date: "02.10.19:", desc: "Improve permissions fixing on render & dvb devices." }
- { date: "27.12.19:", desc: "Update to Alpine 3.11." }
- { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
- { date: "18.08.19:", desc: "Add AMD drivers." }
- { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
- { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
- { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
- { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
- { 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." }

View File

@@ -1,7 +1,7 @@
{
"prefer_picon": true,
"chiconpath": "file:///picons/%C.png",
"piconpath": "file:///picons/",
"piconscheme": 0,
"chiconscheme": 2
"prefer_picon": true,
"chiconpath": "file:///picons/%C.png",
"piconpath": "file:///picons/",
"piconscheme": 0,
"chiconscheme": 2
}

0
root/etc/services.d/tvheadend/run Normal file → Executable file
View File