Merge pull request #62 from linuxserver/NC14

Update `default`

Dockerfile

@@ -1,19 +1,16 @@
-FROM lsiobase/alpine.nginx:3.5
-MAINTAINER sparklyballs
+FROM lsiobase/alpine.nginx:3.8
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
 
-# package version
-ENV NEXTCLOUD_VER="11.0.2"
-
-# environment settings
+# environment settings
 ENV NEXTCLOUD_PATH="/config/www/nextcloud"
 
-# install build-dependencies
 RUN \
+ echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
 	autoconf \
 	automake \
@@ -21,31 +18,15 @@ 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
+ echo "**** 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 \
@@ -59,52 +40,55 @@ RUN \
 	php7-imap \
 	php7-intl \
 	php7-ldap \
-	php7-mbstring \
 	php7-mcrypt \
+	php7-memcached \
+	php7-opcache \
 	php7-pcntl \
 	php7-pdo_mysql \
 	php7-pdo_pgsql \
 	php7-pdo_sqlite \
 	php7-pgsql \
 	php7-posix \
+	php7-redis \
 	php7-sqlite3 \
-	php7-xml \
 	php7-xmlreader \
-	php7-zip && \
-
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php7-memcached && \
-
-# fetch php smbclient source
+	php7-zip \
+	samba \
+	sudo \
+	tar \
+	unzip && \
+ echo "**** compile smbclient ****" && \
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
-
-# compile smbclient
  cd /tmp/smbclient && \
  phpize7 && \
  ./configure \
 	--with-php-config=/usr/bin/php-config7 && \
  make && \
  make install && \
-
-# uninstall build-dependencies
- apk del --purge \
-	build-dependencies && \
-
-# configure php and nginx for nextcloud
+ echo "**** configure php and nginx for nextcloud ****" && \
  echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
  sed -i \
- 's/;always_populate_raw_post_data = -1/always_populate_raw_post_data = -1/g' \
-	/etc/php7/php.ini && \
+	-e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
+	-e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
+	-e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
+	-e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
+	-e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
+	-e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
+	-e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
+		/etc/php7/php.ini && \
+ sed -i \
+	'/opcache.enable=1/a opcache.enable_cli=1' \
+		/etc/php7/php.ini && \
  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
-
-# cleanup
+ echo "**** cleanup ****" && \
+ apk del --purge \
+	build-dependencies && \
  rm -rf \
 	/tmp/*
 
-# copy local files
+# copy local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 443
 VOLUME /config /data

README.md

@@ -13,7 +13,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # 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/)
+[![](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)](https://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](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-nextcloud)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-nextcloud/)
 
 [Nextcloud][appurl] gives you access to all your files wherever you are.
 
@@ -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,16 @@ Please note you will need a MySQL/MariaDB or other backend database to set this
 
 ## Versions
 
++ **05.09.18:** Rebase to alpine 3.8.
++ **11.06.18:** Use latest rather than specific version for initial install.
++ **26.04.18:** Bump default install to 13.0.1.
++ **06.02.18:** Bump default install to 13.0.0.
++ **26.01.18:** Rebase to alpine 3.7, bump default install to 12.0.5.
++ **12.12.17:** Bump default install to 12.0.4, fix continuation lines.
++ **15.10.17:** Sed php.ini for opcache requirements in newer nextcloud versions.
++ **20.09.17:** Bump default install to 12.0.3.
++ **19.08.17:** Bump default install to 12.0.2.
++ **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,12 +20,13 @@ 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;
   add_header X-Permitted-Cross-Domain-Policies none;
-
+  add_header Referrer-Policy no-referrer always;
+  
   # Path to the root of your installation
   root /config/www/nextcloud/;
   # set max upload size
@@ -97,6 +98,7 @@ server {
     add_header X-Robots-Tag none;
     add_header X-Download-Options noopen;
     add_header X-Permitted-Cross-Domain-Policies none;
+    add_header Referrer-Policy no-referrer always;
     # Optional: Don't log access to assets
     access_log off;
   }

root/etc/cont-init.d/50-install

@@ -7,7 +7,7 @@ mkdir -p \
 # install app
 if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
 curl -o /tmp/nextcloud.tar.bz2 -L \
-	https://download.nextcloud.com/server/releases/nextcloud-"${NEXTCLOUD_VER}".tar.bz2
+	https://download.nextcloud.com/server/releases/latest.tar.bz2
 tar xf /tmp/nextcloud.tar.bz2 -C \
 	"${NEXTCLOUD_PATH}" --strip-components=1
 rm -f \