Merge pull request #17 from linuxserver/11.0.2

bump default install to 11.0.2

.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
 MAINTAINER sparklyballs
 
-# set paths
+# set version label
-ENV WWW_ROOT="/config/www"
+ARG BUILD_DATE
-ENV NEXTCLOUD_PATH="${WWW_ROOT}/nextcloud"
+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 \
@@ -19,25 +26,7 @@ RUN \
 	samba-dev \
 	zlib-dev && \
 
-# 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 && \
-
-# uninstall build-dependencies
- apk del --purge \
-	build-dependencies && \
-
-# cleanup
- rm -rfv /tmp/*
-
 # install runtime packages
-RUN \
  apk add --no-cache \
 	curl \
 	ffmpeg \
@@ -58,10 +47,10 @@ RUN \
 	php5-mcrypt \
 	php5-openssl \
 	php5-pcntl \
+	php5-pgsql \
 	php5-pdo_mysql \
 	php5-pdo_pgsql \
 	php5-pdo_sqlite \
-	php5-pgsql \
 	php5-posix \
 	php5-sqlite3 \
 	php5-xml \
@@ -72,26 +61,39 @@ RUN \
 	sudo \
 	tar \
 	unzip && \
- apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
-	php5-memcached
 
-# configure php extensions
+ apk add --no-cache \
-RUN \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
- echo "extension="smbclient.so"" >> /etc/php5/php.ini
+	php5-memcached && \
 
-# configure php for nextcloud
+# fetch php smbclient source
-RUN \
+ git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
+
+# compile smbclient
+ cd /tmp/smbclient && \
+ phpize && \
+ ./configure && \
+	make && \
+	make install && \
+
+# uninstall build-dependencies
+ 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
+ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /defaults/nginx-fpm.conf && \
 
-# add local files
+# cleanup
+ rm -rf \
+	/tmp/*
+
+# copy local files
 COPY root/ /
 
 # ports and volumes
-VOLUME /config /data
 EXPOSE 443
-
+VOLUME /config /data
-# set nextcloud version
-ENV NEXTCLOUD_VER="9.0.53"

README.md

@@ -1,6 +1,11 @@
-![https://linuxserver.io](http://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
+![https://linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)
+
+## 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.
+
+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.
+
+* [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!
 
-## 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/).
 

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

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

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

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