From 314f59a89f4beb40ef1fc96ae6f06f47778f0aa7 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sat, 27 May 2017 23:37:20 +0100
Subject: [PATCH 1/3] bump to alpine 3.6

---
 Dockerfile | 5 +++--
 README.md  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 524bd80..00abf29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg
 
 # package version
@@ -59,9 +59,9 @@ RUN \
 	gzip \
 	libcrypto1.0 \
 	libcurl	\
+	libressl \
 	libssl1.0 \
 	linux-headers \
-	libressl \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
@@ -76,6 +76,7 @@ RUN \
 	perl-dbd-sqlite \
 	perl-dbi \
 	perl-digest-sha1 \
+	perl-doc \
 	perl-file-slurp \
 	perl-file-temp \
 	perl-file-which \
diff --git a/README.md b/README.md
index 0de3a21..4674679 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,7 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
++ **27.05.2017:** Rebase to alpine 3.6.
 + **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.

From 0d53fe87a0c6ead4f939f83895cf3e43ba21fb3f Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sat, 27 May 2017 23:52:54 +0100
Subject: [PATCH 2/3] add pcre2 dependency

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 00abf29..4e18c25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,7 @@ RUN \
 	mercurial \
 	libressl-dev \
 	patch \
+	pcre2-dev \
 	perl-dev \
 	pkgconf \
 	sdl-dev \
@@ -62,6 +63,7 @@ RUN \
 	libressl \
 	libssl1.0 \
 	linux-headers \
+	pcre2 \
 	perl \
 	perl-archive-zip \
 	perl-boolean \

From 87d4b9c81136f12cd3388dfc465683903141af06 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sun, 28 May 2017 02:34:06 +0100
Subject: [PATCH 3/3] remove unneeded ffmpeg variable

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4e18c25..e7ca42f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,6 @@ MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG FFMPEG_VER="ffmpeg"
 ARG TZ="Europe/Oslo"
 ARG XMLTV_VER="0.5.69"
 
@@ -25,7 +24,7 @@ RUN \
 	automake \
 	cmake \
 	coreutils \
-	${FFMPEG_VER}-dev \
+	ffmpeg-dev \
 	file \
 	findutils \
 	g++ \
@@ -194,8 +193,8 @@ RUN \
 
 # install runtime packages
  apk add --no-cache \
-	${FFMPEG_VER} \
-	${FFMPEG_VER}-libs \
+	ffmpeg \
+	ffmpeg-libs \
 	libhdhomerun-libs \
 	libxml2 \
 	libxslt && \