Merge pull request #34 from tobbenb/master

Add picons to /picons and add info to README

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--- Provide a general summary of the issue in the Title above -->
 
 [linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)][linuxserverurl]
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 	
 
 <!--- If you have an issue with the project, please provide us with the following information -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--- Provide a general summary of your changes in the Title above -->
 
 [linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)][linuxserverurl]
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 	
 
 <!--- Before submitting a pull request please check the following -->

Dockerfile

@@ -6,6 +6,11 @@ ARG ARGTABLE_VER="2.13"
 ARG UNICODE_VER="2.09"
 ARG XMLTV_VER="0.5.68"
 
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Build-date:- ${BUILD_DATE}"
+
 # Environment settings
 ENV HOME="/config"
 
@@ -96,7 +101,7 @@ RUN \
  /tmp/iconv-src && \
  curl -o \
  /tmp/iconv.tar.gz -L \
-	http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz && \
+	ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz && \
  tar xf /tmp/iconv.tar.gz -C \
 	/tmp/iconv-src --strip-components=1 && \
  cd /tmp/iconv-src && \
@@ -240,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

@@ -1,9 +1,9 @@
 [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/
+[ircurl]: https://www.linuxserver.io/irc/
+[podcasturl]: https://www.linuxserver.io/podcast/
 
-[![linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)][linuxserverurl]
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
 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]
@@ -49,7 +49,13 @@ Add one of the tags, if required, to the linuxserver/tvheadend line of the run/c
 
 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**
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+
 
 * `-p 1234` - the port(s)
 * `-v /config` - explain what lives here
@@ -123,6 +129,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`
@@ -130,6 +141,7 @@ For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
 ## Versions
 
++ **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