Merge pull request #8 from linuxserver/alpine_3.6

bump to alpine 3.6
2026-02-20 00:54:58 +08:00 · 2017-05-25 22:36:43 +01:00 · 2017-05-25 22:36:43 +01:00 · 9c44e6b7f1
commit 9c44e6b7f1
parent 9a0dc9aced eb3f9cc957
2 changed files with 3 additions and 7 deletions
--- a/9
+++ b/9
@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.5
+FROM lsiobase/alpine.nginx:3.6
 MAINTAINER Stian Larsen, sparklyballs, aptalca

 # set version label
@ -26,12 +26,7 @@ RUN \
 	nginx-mod-mail \
 	nginx-mod-rtmp \
 	nginx-mod-stream \
-	nginx-vim && \
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/main \
-	libwebp && \
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
+	nginx-vim \
 	php7-ctype \
 	php7-curl \
 	php7-dom \
--- a/README.md
+++ b/README.md
@ -81,6 +81,7 @@ Add your web files to /config/www for hosting.

 ## Versions

+ **25.05.17:** Rebase to alpine 3.6.
 + **18.04.17:** Add php7-sockets
 + **27.02.17:** Rebase to alpine 3.5, update to nginx 1.10.2 and php7
 + **14.10.16:** Add version layer information.