Merge pull request #37 from linuxserver/alpine3.5

Update Alpine to 3.5, change dvb-apps to only compile needed libs and update README.

Dockerfile

@@ -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 -C lib && \
- make install && \
+ make -C lib install && \
 
 # build tvheadend
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
@@ -245,6 +245,9 @@ RUN \
 # copy local files
 COPY root/ /
 
+# add picons
+ADD picons.tar.bz2 /picons
+
 # ports and volumes
 EXPOSE 9981 9982
 VOLUME /config /recordings

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).
@@ -28,6 +29,7 @@ docker create \
   --name=tvheadend \
   --net=bridge \
   -v <path to data>:/config \
+  -v <path to recordings>:/recordings \
   -e PGID=<gid> -e PUID=<uid>  \
   -p 9981:9981 \
   -p 9982:9982 \
@@ -58,7 +60,8 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
 
 
 * `-p 1234` - the port(s)
-* `-v /config` - explain what lives here
+* `-v /config` - Where TVHeadend show store it's config files
+* `-v /recordings` - Where you want the PVR to store recordings
 * `-e PGID` for GroupID - see below for explanation
 * `-e PUID` for UserID - see below for explanation
 * `--device=/dev/dvb` - for passing through DVB-cards
@@ -129,6 +132,11 @@ The xml file has to be named guide.xml.
 
 For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
+**Picons**
+
+We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+You need to enable minimum advanced view level to see the picons options.
+
 ## Info
 
 * Shell access whilst the container is running: `docker exec -it tvheadend /bin/bash`
@@ -136,6 +144,8 @@ For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
 ## 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.
 + **10.09.2016:** Add layer badges to README.

root/etc/cont-init.d/30-config

@@ -12,4 +12,5 @@ mkdir -p \
 
 # permissions
 chown -R abc:abc \
-	/config
+	/config \
+	/picons