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"
@@ -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 \
@@ -61,6 +46,8 @@ RUN \
 	php7-ldap \
 	php7-mbstring \
 	php7-mcrypt \
+	php7-memcached \
+	php7-opcache \
 	php7-pcntl \
 	php7-pdo_mysql \
 	php7-pdo_pgsql \
@@ -70,11 +57,11 @@ RUN \
 	php7-sqlite3 \
 	php7-xml \
 	php7-xmlreader \
-	php7-zip && \
-
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php7-memcached && \
+	php7-zip \
+	samba \
+	sudo \
+	tar \
+	unzip && \
 
 # fetch php smbclient source
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \

README.md

@@ -65,6 +65,8 @@ Access the webui at `<your-ip>:443`, for more information check out [Nextcloud][
 
 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;