From 6d773ab4a7babfa6879916fd2b021f5773fcb402 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Thu, 25 May 2017 11:52:06 +0100
Subject: [PATCH] bump to alpine 3.6

---
 Dockerfile | 37 +++++++++++++++----------------------
 README.md  |  1 +
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 819e027..58bc18c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.5
+FROM lsiobase/alpine.nginx:3.6
 MAINTAINER sparklyballs
 
 # set version label
@@ -6,33 +6,26 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# add repositories
-RUN \
- echo "@edge http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
- echo "@community http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
-
 # install packages
+RUN \
  apk add --no-cache \
 	curl \
+	imagemagick \
 	lynx \
+	php7-apcu \
+	php7-cgi \
+	php7-dom \
+	php7-exif \
+	php7-gd \
+	php7-imagick \
+	php7-mysqli \
+	php7-mysqlnd \
+	php7-pear \
+	php7-xmlrpc \
+	php7-xsl \
 	re2c \
 	unzip \
-	wget && \
- apk add --no-cache \
-	imagemagick@edge \
-	libwebp@edge && \
- apk add --no-cache \
-	php7-apcu@community \
-	php7-cgi@community \
-	php7-dom@community \
-	php7-exif@community \
-	php7-gd@community \
-	php7-imagick@community \
-	php7-mysqli@community \
-	php7-mysqlnd@community \
-	php7-pear@community \
-	php7-xmlrpc@community \
-	php7-xsl@community
+	wget
 
 # copy local files
 COPY root/ /
diff --git a/README.md b/README.md
index 23c28c3..68429c2 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ The easiest way to edit the configuration file is to enable local files editor f
 
 ## Versions
 
++ **25.05.17:** Rebase to alpine linux 3.6.
 + **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick.
 + **20.04.17:** Add php7-exif package, thanks iiska
 + **23.02.17:** Rebase to alpine linux 3.5 and nginx.