Merge pull request #24 from linuxserver/php7_edge

use edge repository for php dependencies

.dockerignore

@@ -0,0 +1,6 @@
+.git
+.gitignore
+.github
+.gitattributes
+READMETEMPLATE.md
+README.md

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+	
+
+<!--- If you have an issue with the project, please provide us with the following information -->
+
+<!---  Host OS -->
+<!--- Command line users, your run/create command, GUI/Unraid users, a screenshot of your template settings. -->
+<!--- Docker log output, docker log <container-name>      -->
+<!--- Mention if you're using symlinks on any of the volume mounts. -->
+
+
+<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
+
+<!--- What you think your suggestion brings to the project, or fixes with the project -->
+<!--- If it's a fix, would it be better suited as a Pull request to the repo ? -->
+
+##  Thanks, team linuxserver.io
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+	
+
+<!--- Before submitting a pull request please check the following -->
+
+<!---  That you have made a branch in your fork, we'd rather not merge from your master -->
+<!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
+<!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
+<!---  -->
+
+##  Thanks, team linuxserver.io
+

.gitignore

@@ -0,0 +1,43 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

Dockerfile

@@ -1,9 +1,16 @@
-FROM lsiobase/alpine.nginx
+FROM lsiobase/alpine.nginx:3.5
 MAINTAINER sparklyballs
 
-# set paths
-ENV WWW_ROOT="/config/www"
-ENV NEXTCLOUD_PATH="${WWW_ROOT}/nextcloud"
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+
+# package version
+ENV NEXTCLOUD_VER="11.0.2"
+
+# environment settings
+ENV NEXTCLOUD_PATH="/config/www/nextcloud"
 
 # install build-dependencies
 RUN \
@@ -14,83 +21,90 @@ RUN \
 	g++ \
 	gcc \
 	make \
-	php5-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 \
+	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-pcntl \
+	php7-pdo_mysql \
+	php7-pdo_pgsql \
+	php7-pdo_sqlite \
+	php7-pgsql \
+	php7-posix \
+	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
  git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
 
 # compile smbclient
  cd /tmp/smbclient && \
-	phpize && \
-	./configure && \
-		make && \
-		make install && \
+ phpize7 && \
+ ./configure \
+	--with-php-config=/usr/bin/php-config7 && \
+ make && \
+ make install && \
 
 # uninstall build-dependencies
  apk del --purge \
 	build-dependencies && \
 
-# cleanup
- rm -rfv /tmp/*
-
-# install runtime packages
-RUN \
- 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-pdo_mysql \
-	php5-pdo_pgsql \
-	php5-pdo_sqlite \
-	php5-pgsql \
-	php5-posix \
-	php5-sqlite3 \
-	php5-xml \
-	php5-xmlreader \
-	php5-zip \
-	php5-zlib \
-	samba \
-	tar \
-	unzip && \
- apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php5-memcached
-
-# configure php extensions
-RUN \
- echo "extension="smbclient.so"" >> /etc/php5/php.ini
-
-# configure php for nextcloud
-RUN \
+# 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/php5/php.ini && \
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /defaults/nginx-fpm.conf
+	/etc/php7/php.ini && \
+ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
 
-# add local files
+# cleanup
+ rm -rf \
+	/tmp/*
+
+# copy local files
 COPY root/ /
 
 # ports and volumes
-VOLUME /config /data
 EXPOSE 443
-
-# set nextcloud version
-ENV NEXTCLOUD_VER="9.0.52"
+VOLUME /config /data

README.md

@@ -1,6 +1,82 @@
-![https://linuxserver.io](http://www.linuxserver.io/wp-content/uploads/2015/06/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, and should not be used by the general public.
-If you are curious about the current progress or want to comment\contribute to this work, feel free to join us at our irc channel:
-[IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io` or visit our website at [https://linuxserver.io](https://www.linuxserver.io/).
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
+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!
+
+# 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/)
+
+[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.
+
+## 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
+
++ **07.03.17:** Release into main repository and upgrade to php7 and Alpine 3.5.

root/defaults/nextcloud

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

root/etc/cont-init.d/40-config

@@ -1,5 +1,8 @@
 #!/usr/bin/with-contenv bash
 
 # permissions
-chown abc:abc /config /data
-chown -R abc:abc  /var/lib/nginx
+chown abc:abc \
+	/config \
+	/data
+chown -R abc:abc  \
+	/var/lib/nginx

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

@@ -1,14 +1,20 @@
 #!/usr/bin/with-contenv bash
 
-mkdir -p "${WWW_ROOT}"
-chown abc:abc "${WWW_ROOT}"
+# create folders
+mkdir -p \
+	"${NEXTCLOUD_PATH}"
 
+# install app
 if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
-curl -o /tmp/nextcloud.zip -L \
-https://download.nextcloud.com/server/releases/nextcloud-"${NEXTCLOUD_VER}".zip
-cd /tmp || true
-unzip nextcloud.zip
-mv /tmp/nextcloud "${NEXTCLOUD_PATH}"
-rm -f /tmp/nextcloud.zip
-chown abc:abc -R "${NEXTCLOUD_PATH}"
+curl -o /tmp/nextcloud.tar.bz2 -L \
+	https://download.nextcloud.com/server/releases/nextcloud-"${NEXTCLOUD_VER}".tar.bz2
+tar xf /tmp/nextcloud.tar.bz2 -C \
+	"${NEXTCLOUD_PATH}" --strip-components=1
+rm -f \
+	/tmp/nextcloud.tar.bz2
+chown abc:abc -R \
+	"${NEXTCLOUD_PATH}"
 fi
+
+# set cronjob
+crontab /defaults/nextcloud

root/etc/cont-init.d/60-memcache

@@ -1,5 +1,9 @@
 #!/usr/bin/with-contenv bash
 
-[[ ! -f /config/www/nextcloud/config/config.php ]] && cp /defaults/config.php /config/www/nextcloud/config/config.php
+# copy config
+[[ ! -f /config/www/nextcloud/config/config.php ]] && \
+	cp /defaults/config.php /config/www/nextcloud/config/config.php
 
-chown abc:abc /config/www/nextcloud/config/config.php
+# permissions
+chown abc:abc \
+	/config/www/nextcloud/config/config.php

root/etc/services.d/cron/run

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+/usr/sbin/crond -f -S -l 0 -c /etc/crontabs