Merge pull request #37 from linuxserver/alpine3.5

Update Alpine to 3.5, change dvb-apps to only compile needed libs and update README.
Update README
2017-02-05 14:32:48 +00:00 · 2017-02-05 14:57:48 +01:00 · 2017-02-04 23:01:36 +01:00 · 2017-01-28 13:41:53 +00:00
2 changed files with 6 additions and 4 deletions
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER saarg

 # package version
@@ -164,8 +164,8 @@ RUN \
 # build dvb-apps
 hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
 cd /tmp/dvb-apps && \
- make && \
- make install && \
+ make -C lib && \
+ make -C lib install && \

 # build tvheadend
 git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
--- a/README.md
+++ b/README.md
@@ -11,9 +11,10 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!

 # linuxserver/tvheadend
-[![](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 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).
@@ -143,6 +144,7 @@ You need to enable minimum advanced view level to see the picons options.

 ## Versions

+ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
 + **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
 + **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
 + **18.09.2016:** Update XMLTV to 0.5.68 and update README.
Author	SHA1	Message	Date
sparklyballs	dc1d442d96	Merge pull request #37 from linuxserver/alpine3.5 Update Alpine to 3.5, change dvb-apps to only compile needed libs and update README.	2017-02-05 14:32:48 +00:00
tobbenb	a7c57ecc35	Update README	2017-02-05 14:57:48 +01:00
tobbenb	ec5307ef63	Update to Alpine 3.5 and change dvb-apps to only compile needed libs	2017-02-04 23:01:36 +01:00
sparklyballs	abfafbb52e	fix badges	2017-01-28 13:41:53 +00:00