Merge pull request #26 from linuxserver/microbadger

Microbadger

Dockerfile

@@ -3,7 +3,6 @@ MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG TVH_VER="e3e8a797"
 ARG UNICODE_VER="2.09"
 ARG XMLTV_VER="0.5.67"
 
@@ -21,6 +20,7 @@ RUN \
 	cmake \
 	coreutils \
 	ffmpeg-dev \
+	file \
 	findutils \
 	g++ \
 	gcc \
@@ -85,6 +85,23 @@ RUN \
 	wget \
 	zlib && \
 
+# build libiconv
+ mkdir -p \
+ /tmp/iconv-src && \
+ curl -o \
+ /tmp/iconv.tar.gz -L \
+	http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz && \
+ tar xf /tmp/iconv.tar.gz -C \
+	/tmp/iconv-src --strip-components=1 && \
+ cd /tmp/iconv-src && \
+ ./configure \
+	--prefix=/usr/local && \
+ patch -p1 -i \
+	/tmp/patches/libiconv-1-fixes.patch && \
+ make && \
+ make install && \
+ libtool --finish /usr/local/lib && \
+
 # install perl modules
  curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm HTML::TableExtract && \
@@ -130,7 +147,6 @@ RUN \
 # build tvheadend
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
  cd /tmp/tvheadend && \
- git checkout "${TVH_VER}" && \
  ./configure \
 	--disable-ffmpeg_static \
 	--disable-hdhomerun_static \

README.md

@@ -1,10 +1,130 @@
-![https://linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
+[linuxserverurl]: https://linuxserver.io
+[forumurl]: https://forum.linuxserver.io
+[ircurl]: https://www.linuxserver.io/index.php/irc/
+[podcasturl]: https://www.linuxserver.io/index.php/category/podcast/
 
-## This is a Container in active development by the [LinuxServer.io](https://linuxserver.io) team and is not recommended for use by the general public.
+[![linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)][linuxserverurl]
 
-If you want to comment\contribute on this container , are looking for support on any of our other work , or are curious about us in general, check out the following.
+The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
+* [forum.linuxserver.io][forumurl]
+* [IRC][ircurl] on freenode at `#linuxserver.io`
+* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
-* [forum.linuxserver.io](https://forum.linuxserver.io)
-* [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`
-* [Podcast](https://www.linuxserver.io/index.php/category/podcast/) 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/)
+[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).
+
+[![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][tvheadendurl]
+[tvheadendurl]: https://www.tvheadend.org/
+
+## Usage
+
+```
+docker create \
+  --name=tvheadend \
+  -v <path to data>:/config \
+  -e PGID=<gid> -e PUID=<uid>  \
+  -p 9981:9981 \
+  -p 9982:9982 \
+  --device=/dev/dvb
+  linuxserver/tvheadend
+```
+The --device=/dev/dvb is 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.
+
+
+You can choose between ,using tags, latest (default, and no tag required or a specific stable version of tvheadend.
+
+Add one of the tags, if required, to the linuxserver/tvheadend line of the run/create command in the following format, linuxserver/tvheadend:stable-4.0.9
+
+#### Tags
+
++ **stable-4.0.9** : latest stable version.
+
+#### 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.
+
+**Parameters**
+
+* `-p 1234` - the port(s)
+* `-v /config` - explain what lives here
+* `-e PGID` for GroupID - see below for explanation
+* `-e PUID` for UserID - see below for explanation
+* `-e TZ` - for timezone information *eg Europe/London, etc*
+
+It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it tvheadend /bin/bash`.
+
+### User / Group Identifiers
+
+Sometimes when using data 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`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
+
+In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
+
+```
+  $ id <dockeruser>
+    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
+```
+
+## Setting up the application
+
+The setup depends if you run the one of the stable tags or use latest. Running latest is the easiest as it has a setup wizard.
+
+**Stable**
+
+First thing to do is to go to Configuration --> DVB Inputs --> TV adapters and add your LNB/switch info. Then create a new network in the Networks tab and set the correct pre-defined muxes and orbital position.
+Go back to the TV adapters tab and add the newly created network under universal LNB. Go back to the Networks tab and mark the network you created earlier and press the Force Scan button. Tvheadend will now scan the muxes for services.
+
+After the scan is done, head to the Services tab and find the services you want as channels, mark them, and press map services. They should now appear under Configuration --> Channel/EPG.
+
+**Latest**
+
+The first thing to do is to run the setup wizard. If it doesn't pop up at first login, you can find it in Configuration --> General --> Base and click Start Wizard. This will guide you to set up the basic parts of tvheadend.
+
+**Configuring XMLTV grabber**
+
+To configure the XMLTV grabber, first check if your grabber is listed in Configuration --> Channel/EPG --> EPG Grabber Modules. If it's listed, you will have to configure the grabber before enabling.
+Find the path in the path field of your grabber. We will use the last part. It starts with tv_grab_. Add it after /usr/bin/ in the below command. There should be no space between Usr/bin/ and the part you added. 
+
+```
+docker exec -it -u abc tvheadend /usr/bin/for_you_to_fill_out --configure
+```
+
+Now follow the onscreen progress. If you get asked about cache, just accept the default. After you have configured your grabber, you can go back and enable your grabber.
+
+If you allready have a configuration file, you can add it in the .xmltv folder where you mapped the /config volume. If it's not created, create it.
+
+**Comskip**
+This container comes with Comskip for commercial flagging of recordings. This you have to add in the recording config of tvheadend.
+Go to Configuration --> Recording. Change the view level to advanced in the top right corner, and add the below in the Post-processor command field.
+
+```
+comskip --ini=/config/comskip/comskip.ini "%f"
+```
+
+Now comskip will run after each recording is finished. You will find comskip.ini in the comskip folder of your /config volume mapping. See the [Comskip] (http://www.kaashoek.com/comskip/) homepage for tuning of the ini file.
+
+
+**FFmpeg**
+
+FFmpeg is installed in /usr/bin/ in case you need to use it with pipe.
+
+**EPG XML file**
+
+If you have EPG data in XML format from a supplier, you can drop it in the data folder of your your /config volume mapping. Then choose the XML file grabber in Configuration --> Channel/EPG --> EPG Grabber Modules.
+If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
+
+For advanced setup of tvheadend, go to [tvheadend.org] (https://www.tvheadend.org)
+
+## Info
+
+* Shell access whilst the container is running: `docker exec -it tvheadend /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f tvheadend`
+
+## Versions
+
++ **10.09.2016:** Add layer badges to README.
++ **05.09.2016:** Initial release.

READMETEMPLATE.md

@@ -1,95 +0,0 @@
-![https://linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
-
-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring easy user mapping and community support. Find us for support at:
-* [forum.linuxserver.io](https://forum.linuxserver.io)
-* [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`
-* [Podcast](https://www.linuxserver.io/index.php/category/podcast/) covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
-
-# linuxserver/tvheadend-unstable
-
-[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).
-
-
-## Usage
-
-```
-docker create \
-  --name=tvheadend-unstable \
-  -v <path to data>:/config \
-  -e PGID=<gid> -e PUID=<uid>  \
-  -p 9981:9981 \
-  -p 9982:9982 \
-  --device=/dev/dvb
-  linuxserver/tvheadend-unstable
-```
-The --device=/dev/dvb is 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.
-
-**Parameters**
-
-* `-p 1234` - the port(s)
-* `-v /config` - explain what lives here
-* `-e PGID` for GroupID - see below for explanation
-* `-e PUID` for UserID - see below for explanation
-
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it tvheadend-unstable /bin/bash`.
-
-### User / Group Identifiers
-
-Sometimes when using data 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`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
-
-In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
-
-```
-  $ id <dockeruser>
-    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
-```
-
-## Setting up the application
-
-The first thing to do is to run the setup wizard. If it doesn't pop up at first login, you can find it in Configuration --> General --> Base and click Start Wizard. This will guide you to set up the basic parts of tvheadend.
-
-**Configuring XMLTV grabber**
-
-To configure the XMLTV grabber, first check if your grabber is listed in Configuration --> Channel/EPG --> EPG Grabber Modules. If it's listed, you will have to configure the grabber before enabling.
-Find the path in the path field of your grabber. We will use the last part. It starts with tv_grab_. Add it after /usr/bin/ in the below command. There should be no space between Usr/bin/ and the part you added. 
-
-```
-docker exec -it -u abc tvheadend-unstable /usr/bin/ --configure
-```
-
-Now follow the onscreen progress. If you get asked about cache, just accept the default. After you have configured your grabber, you can go back and enable your grabber.
-
-If you allready have a configuration file, you can add it in the .xmltv folder where you mapped the /config volume. If it's not created, create it.
-
-**Comskip**
-This container comes with Comskip for commercial flagging of recordings. This you have to add in the recording config of tvheadend.
-Go to Configuration --> Recording. Change the view level to advanced in the top right corner, and add the below in the Post-processor command field.
-
-```
-comskip "%f"
-```
-
-Now comskip will run after each recording is finished. You will find comskip.ini in the comskip folder of your /config volume mapping. See the [Comskip] (http://www.kaashoek.com/comskip/) homepage for tuning of the ini file.
-
-
-**FFmpeg**
-
-FFmpeg is installed in /usr/bin/ in case you need to use it with pipe.
-
-**EPG XML file**
-
-If you have EPG data in XML format from a supplier, you can drop it in the data folder of your your /config volume mapping. Then choose the XML file grabber in Configuration --> Channel/EPG --> EPG Grabber Modules.
-If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
-
-For advanced setup of tvheadend, go to [tvheadend.org] (https://www.tvheadend.org)
-
-## Info
-
-* Shell access whilst the container is running: `docker exec -it tvheadend-unstable /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f tvheadend-unstable`
-
-## Versions
-
-+ **14.08.2016:** Initial release.

patches/libiconv-1-fixes.patch

@@ -0,0 +1,46 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 47345f5dcfb91da8afed7c4e6c29faa2056db447 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Fri, 7 Jun 2013 17:44:24 +1000
+Subject: [PATCH] remove gets since c++11 removed it
+ https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00186.html
+
+
+diff --git a/srclib/stdio.in.h b/srclib/stdio.in.h
+index 473c84c..dfb59eb 100644
+--- a/srclib/stdio.in.h
++++ b/srclib/stdio.in.h
+@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+-- 
+1.8.2.3
+

root/defaults/7a5edfbe189851e5b1d1df19c93962f0

@@ -34,5 +34,5 @@
 	"omit-title": false,
 	"clean-title": false,
 	"whitespace-in-title": false,
-	"windows-compatible-filenames": false
+	"windows-compatible-filenames": true
 }

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

@@ -2,16 +2,14 @@
 
 # make folders
 mkdir -p \
-	/config/.hts/tvheadend/dvr/config \
 	/config/comskip
 
 # copy config
-[[ ! -e /config/.hts/tvheadend/dvr/config/7a5edfbe189851e5b1d1df19c93962f0 ]] && \
-	cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/.hts/tvheadend/dvr/config/7a5edfbe189851e5b1d1df19c93962f0
-[[ ! -e /config/comskip/comskip.ini ]]
+[[ ! -e /config/dvr/config ]] && \
+	(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
 
 # permissions
 chown -R abc:abc \
-	/config \
-	/config/.hts
+	/config

root/etc/services.d/tvheadend/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 exec \
-	s6-setuidgid abc /usr/bin/tvheadend -C
+	s6-setuidgid abc /usr/bin/tvheadend -C -c /config