Merge pull request #53 from linuxserver/README_edits

"placeholder" image to fix broken link, add missing image version info
2017-05-11 10:46:09 +01:00 · 2017-05-11 07:43:55 +01:00 · 2017-05-09 15:58:20 +01:00 · 2017-05-09 11:48:56 +01:00 · 2017-05-01 14:01:38 +01:00
2 changed files with 14 additions and 16 deletions
--- a/14
+++ b/14
@@ -12,18 +12,7 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Build-date:- ${BUILD_DATE}"

-# Environment settings
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Build-date:- ${BUILD_DATE}"
-
-# Environment settings
+# environment settings
 ENV HOME="/config"

 # copy patches
@@ -62,7 +51,6 @@ RUN \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev && \

-
 # add runtime dependencies required in build stage
 apk add --no-cache \
 	bsd-compat-headers \
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 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)][appurl]
+[![tvheadend](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/tvheadend-big.png)][appurl]

 ## Usage

@@ -42,11 +42,12 @@ The --device=/dev/dvb is only needed if you want to pass through a DVB card to t

 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
+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.2.1

 #### Tags

-+ **stable-4.0.9** : latest stable version.
+ **stable-4.2.1** : latest stable version.
+ **stable-4.0.9** : old stable version. Will not be updated anymore!

 #### Host vs. Bridge

@@ -149,8 +150,17 @@ You need to enable minimum advanced view level to see the picons options.
 * 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`

+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' tvheadend`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/tvheadend`
+
 ## Versions

+ **01.05.2017:** Update to tvheadend 4.2.1 stable.
 + **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
 + **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
 + **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
Author	SHA1	Message	Date
j0nnymoe	4e44306b81	Merge pull request #53 from linuxserver/README_edits "placeholder" image to fix broken link, add missing image version info	2017-05-11 10:46:09 +01:00
sparklyballs	68a5beb2ce	"placeholder" image to fix broken link, add missing image version info	2017-05-11 07:43:55 +01:00
j0nnymoe	9ce7af875d	Merge pull request #52 from linuxserver/fix_duplicates_dockerfile fix duplicates in Dockerfile, some spacing issues	2017-05-09 15:58:20 +01:00
sparklyballs	51e21fbae9	fix duplicates in Dockerfile, some spacing issues	2017-05-09 11:48:56 +01:00
sparklyballs	97ed2af733	use readme from 4.2.1 branch	2017-05-01 14:01:38 +01:00