Merge pull request #55 from linuxserver/bump_13.0.1

bump default install to 13.0.1

Dockerfile

@@ -1,19 +1,19 @@
-FROM lsiobase/alpine.nginx
-MAINTAINER sparklyballs
+FROM lsiobase/alpine.nginx:3.7
 
 # 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="10.0.1"
+# package version
+ENV NEXTCLOUD_VER="13.0.1"
 
-# 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,79 +21,79 @@ RUN \
 	g++ \
 	gcc \
 	make \
-	php5-dev \
+	php7-dev \
 	re2c \
 	samba-dev \
 	zlib-dev && \
-
-# install runtime packages
+ echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	curl \
 	ffmpeg \
 	libxml2 \
-	php5-apcu \
-	php5-bz2 \
-	php5-ctype \
-	php5-curl \
-	php5-dom \
-	php5-exif \
-	php5-ftp \
-	php5-gd \
-	php5-gmp \
-	php5-iconv \
-	php5-imap \
-	php5-intl \
-	php5-ldap \
-	php5-mcrypt \
-	php5-openssl \
-	php5-pcntl \
-	php5-pgsql \
-	php5-pdo_mysql \
-	php5-pdo_pgsql \
-	php5-pdo_sqlite \
-	php5-posix \
-	php5-sqlite3 \
-	php5-xml \
-	php5-xmlreader \
-	php5-zip \
-	php5-zlib \
+	php7-apcu \
+	php7-bz2 \
+	php7-ctype \
+	php7-curl \
+	php7-dom \
+	php7-exif \
+	php7-ftp \
+	php7-gd \
+	php7-gmp \
+	php7-iconv \
+	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 \
 	samba \
 	sudo \
 	tar \
 	unzip && \
-
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php5-memcached && \
-
-# fetch php smbclient source
+ echo "**** compile smbclient ****" && \
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
-
-# compile smbclient
  cd /tmp/smbclient && \
- phpize && \
- ./configure && \
-	make && \
-	make install && \
-
-# uninstall build-dependencies
+ phpize7 && \
+ ./configure \
+	--with-php-config=/usr/bin/php-config7 && \
+ make && \
+ make install && \
+ echo "**** configure php and nginx for nextcloud ****" && \
+ echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
+ sed -i \
+	-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 && \
+ echo "**** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
-
-# configure php and nginx for nextcloud
- echo "extension="smbclient.so"" >> /etc/php5/php.ini && \
- sed -i \
- 's/;always_populate_raw_post_data = -1/always_populate_raw_post_data = -1/g' \
-	/etc/php5/php.ini && \
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /defaults/nginx-fpm.conf && \
-
-# cleanup
  rm -rf \
 	/tmp/*
 
-# copy local files
+# copy local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 443
 VOLUME /config /data

README.md

@@ -1,11 +1,94 @@
-![https://linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)
+[linuxserverurl]: https://linuxserver.io
+[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/
 
-## This is a Container in active development by the [LinuxServer.io](https://linuxserver.io) team and is not recommended for use by the general public.
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
-If you want to comment\contribute on this container , are looking for support on any of our other work , or are curious about us in general, check out the following.
+The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
+* [forum.linuxserver.io][forumurl]
+* [IRC][ircurl] on freenode at `#linuxserver.io`
+* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
-* [forum.linuxserver.io](https://forum.linuxserver.io)
-* [IRC](https://www.linuxserver.io/irc/) on freenode at `#linuxserver.io`
-* [Podcast](https://www.linuxserver.io/podcast/) 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)](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.
+
+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)][appurl]
+
+## Usage
+
+```
+docker create \
+	--name nextcloud \
+	-p 443:443 \
+	-e PUID=<UID> -e PGID=<GID> \
+	-v </path/to/appdata>:/config \
+	-v <path/to/data>:/data \
+	linuxserver/nextcloud
+```
+
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
 
 
+* `-p 443` - the port nextcloud web interface
+* `-v /config` - nextcloud configs
+* `-v /data` - your personal data
+* `-e PGID` for for GroupID - see below for explanation
+* `-e PUID` for for UserID - see below for explanation
+
+It is based on Alpine Linux with s6 overlay, for shell access whilst the container is running do `docker exec -it nextcloud /bin/bash`
+
+### User / Group Identifiers
+
+Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" <sup>TM</sup>.
+
+In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
+
+```
+  $ id <dockeruser>
+    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
+```
+
+## Setting up the application
+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`.
+
+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/nextcloud`
+
+## Versions
+
++ **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,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;

root/defaults/nextcloud

@@ -1 +1 @@
-*/15  *  *  *  * s6-setuidgid abc php -f /config/www/nextcloud/cron.php
+*/15  *  *  *  * s6-setuidgid abc php7 -f /config/www/nextcloud/cron.php