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

---
 Dockerfile | 25 +++++++------------------
 README.md  |  1 +
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e0f828b3..6e51197f 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
@@ -21,31 +21,16 @@ RUN \
 	g++ \
 	gcc \
 	make \
+	php7-dev \
 	re2c \
 	samba-dev \
 	zlib-dev && \
 
- apk add --no-cache --virtual=build-dependencies \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
-	php7-dev && \
-
 # install runtime packages
  apk add --no-cache \
 	curl \
 	ffmpeg \
 	libxml2 \
-	samba \
-	sudo \
-	tar \
-	unzip && \
-
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/main \
-	icu-libs \
-	libwebp && \
-
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
 	php7-apcu \
 	php7-bz2 \
 	php7-ctype \
@@ -72,7 +57,11 @@ RUN \
 	php7-sqlite3 \
 	php7-xml \
 	php7-xmlreader \
-	php7-zip && \
+	php7-zip \
+	samba \
+	sudo \
+	tar \
+	unzip && \
 
 # fetch php smbclient source
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
diff --git a/README.md b/README.md
index be1f8310..81e4e71f 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ If updating to nextcloud 12 you will need to comment out line `add_header X-Fram
 
 ## Versions
 
++ **25.05.17:** Rebase to alpine 3.6.
 + **22.05.17:** Update to nextcloud 12.0, adding required dependecies and note about commenting out SAMEORIGIN; line.
 + **03.05.17:** Use community repo of memcached.
 + **07.03.17:** Release into main repository and upgrade to php7 and Alpine 3.5.