From 13dbce03716b8d93e719e7a46b32cb15acf26f04 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Wed, 3 May 2017 08:40:13 +0100
Subject: [PATCH 1/2] switch to repo pinning style to add packages, use repo
 imagick

---
 Dockerfile | 67 ++++++++++++++----------------------------------------
 1 file changed, 17 insertions(+), 50 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c005c95..819e027 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,66 +6,33 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# install build packages
+# add repositories
 RUN \
- apk add --no-cache --virtual=build-dependencies \
-	autoconf \
-	curl \
-	file \
-	g++ \
-	gcc \
-	imagemagick-dev \
-	libtool \
-	make && \
- apk add --no-cache --virtual=build-dependencies \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
-	php7-dev && \
+ 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 runtime packages
+# install packages
  apk add --no-cache \
 	curl \
-	imagemagick \
 	lynx \
 	re2c \
 	unzip \
 	wget && \
  apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/main \
-	libwebp && \
+	imagemagick@edge \
+	libwebp@edge && \
  apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
-	php7-apcu \
-	php7-cgi \
-	php7-exif \
-	php7-gd \
-	php7-mysqlnd \
-	php7-pear \
-	php7-xmlrpc \
-	php7-xsl && \
-
-# install php imagemagick
- mkdir -p \
-	/tmp/imagick-src && \
- curl -o \
- /tmp/imagick.tgz -L \
-	https://pecl.php.net/get/imagick && \
- tar xf \
- /tmp/imagick.tgz -C \
-	/tmp/imagick-src --strip-components=1 && \
- cd /tmp/imagick-src && \
- phpize7 && \
- ./configure \
-	--prefix=/usr \
-	--with-php-config=/usr/bin/php-config7 && \
- make && \
- make install && \
- echo "extension=imagick.so" > /etc/php7/conf.d/00_imagick.ini && \
-
-# cleanup
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/tmp/*
+	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
 
 # copy local files
 COPY root/ /

From d2a0a0cc0c1aed3a63548d221c5520526e1f32ab Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Wed, 3 May 2017 08:42:03 +0100
Subject: [PATCH 2/2] update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index df078be..23c28c3 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
 
++ **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.
 + **14.10.16:** Add version layer information.