Merge pull request #34 from linuxserver/alpine_3.6

bump to alpine 3.6

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.5
+FROM lsiobase/alpine.nginx:3.6
 MAINTAINER sparklyballs
 
 # set version label
@@ -7,7 +7,7 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
 # package version
-ENV NEXTCLOUD_VER="11.0.2"
+ENV NEXTCLOUD_VER="12.0.0"
 
 # environment settings
 ENV NEXTCLOUD_PATH="/config/www/nextcloud"
@@ -46,6 +46,8 @@ RUN \
 	php7-ldap \
 	php7-mbstring \
 	php7-mcrypt \
+	php7-memcached \
+	php7-opcache \
 	php7-pcntl \
 	php7-pdo_mysql \
 	php7-pdo_pgsql \
@@ -61,10 +63,6 @@ RUN \
 	tar \
 	unzip && \
 
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php7-memcached && \
-
 # fetch php smbclient source
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
 

README.md

@@ -2,6 +2,8 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://nextcloud.com/
+[hub]: https://hub.docker.com/r/linuxserver/nextcloud/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
@@ -12,14 +14,12 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 
 # linuxserver/nextcloud
 [![](https://images.microbadger.com/badges/version/linuxserver/nextcloud.svg)](https://microbadger.com/images/linuxserver/nextcloud "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/nextcloud.svg)](http://microbadger.com/images/linuxserver/nextcloud "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nextcloud.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-nextcloud)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-nextcloud/)
-[hub]: https://hub.docker.com/r/linuxserver/nextcloud/
 
-[Nextcloud][nextcloudurl] gives you access to all your files wherever you are.
+[Nextcloud][appurl] gives you access to all your files wherever you are.
 
 Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.
 
-[![nextcloud](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nextcloud-icon.png)][nextcloudurl]
-[nextcloudurl]: https://nextcloud.com/
+[![nextcloud](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nextcloud-icon.png)][appurl]
 
 ## Usage
 
@@ -61,10 +61,12 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 ```
 
 ## Setting up the application
-Access the webui at `<your-ip>:443`, for more information check out [Nextcloud][nextcloudurl].  
+Access the webui at `<your-ip>:443`, for more information check out [Nextcloud][appurl].  
 
 Please note you will need a MySQL/MariaDB or other backend database to set this up.  Also please look [here](https://docs.nextcloud.com/server/11/admin_manual/installation/system_requirements.html#database-requirements-for-mysql-mariadb) for how to configure your database with regard to binlog format and installation.
 
+If updating to nextcloud 12 you will need to comment out line `add_header X-Frame-Options "SAMEORIGIN";` in the file /config/nginx/site-confs/default
+
 ## Info
 
 * Monitor the logs of the container in realtime `docker logs -f nextcloud`.
@@ -79,4 +81,7 @@ Please note you will need a MySQL/MariaDB or other backend database to set this
 
 ## 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.

root/defaults/default

@@ -20,7 +20,7 @@ server {
   # Add headers to serve security related headers
   add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
   add_header X-Content-Type-Options nosniff;
-  add_header X-Frame-Options "SAMEORIGIN";
+  # add_header X-Frame-Options "SAMEORIGIN";
   add_header X-XSS-Protection "1; mode=block";
   add_header X-Robots-Tag none;
   add_header X-Download-Options noopen;