Compare commits

..

3 Commits
65 ... 72

Author SHA1 Message Date
j0nnymoe
abf4ff8bd9 Merge pull request #45 from linuxserver/change_cpanm_order
change order of perl cpan package installs
2017-04-08 01:01:12 +01:00
sparklyballs
cf3b5da9a3 change order of perl cpan package installs 2017-04-08 00:32:31 +01:00
sparklyballs
81abf8bc9b fix formatting markdown README 2017-03-15 17:51:03 +00:00
2 changed files with 6 additions and 6 deletions

View File

@@ -123,7 +123,6 @@ RUN \
cpanm File::Path && \ cpanm File::Path && \
cpanm HTML::Entities && \ cpanm HTML::Entities && \
cpanm HTML::TableExtract && \ cpanm HTML::TableExtract && \
cpanm HTTP::Cache::Transparent && \
cpanm inc && \ cpanm inc && \
cpanm JSON::PP && \ cpanm JSON::PP && \
cpanm LWP::Simple && \ cpanm LWP::Simple && \
@@ -135,6 +134,7 @@ RUN \
cpanm version && \ cpanm version && \
cpanm WWW::Mechanize && \ cpanm WWW::Mechanize && \
cpanm XML::DOM && \ cpanm XML::DOM && \
cpanm HTTP::Cache::Transparent && \
# build libiconv # build libiconv
mkdir -p \ mkdir -p \
@@ -180,7 +180,7 @@ RUN \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/config && \ --sysconfdir=/config && \
make && \ make && \
make install && \ make install && \
# build XMLTV # build XMLTV
curl -o /tmp/xmtltv-src.tar.bz2 -L \ curl -o /tmp/xmtltv-src.tar.bz2 -L \

View File

@@ -2,6 +2,8 @@
[forumurl]: https://forum.linuxserver.io [forumurl]: https://forum.linuxserver.io
[ircurl]: https://www.linuxserver.io/irc/ [ircurl]: https://www.linuxserver.io/irc/
[podcasturl]: https://www.linuxserver.io/podcast/ [podcasturl]: https://www.linuxserver.io/podcast/
[appurl]: https://www.tvheadend.org/
[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
@@ -12,15 +14,13 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
# linuxserver/tvheadend # linuxserver/tvheadend
[![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](http://microbadger.com/images/linuxserver/tvheadend "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/) [![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](http://microbadger.com/images/linuxserver/tvheadend "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
[Tvheadend](https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources. [Tvheadend](https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML). Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
[![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][tvheadendurl] [![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][appurl]
[tvheadendurl]: https://www.tvheadend.org/
## Usage ## Usage
@@ -137,7 +137,7 @@ If you have EPG data in XML format from a supplier, you can drop it in the data
If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above. If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
The xml file has to be named guide.xml. The xml file has to be named guide.xml.
For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl] For advanced setup of tvheadend, go to [Tvheadend][appurl]
**Picons** **Picons**