From 339c5477ecb49b850eaf0a53b2ac08dd0ead558b Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 14 Feb 2017 20:14:00 +0000 Subject: [PATCH 1/7] first save up, satisfying depedencies only --- Dockerfile | 74 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index df3eb85b..2bc9c2ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx +FROM lsiobase/alpine.nginx:3.5 MAINTAINER sparklyballs # set version label @@ -21,7 +21,7 @@ RUN \ g++ \ gcc \ make \ - php5-dev \ + php7-dev \ re2c \ samba-dev \ zlib-dev && \ @@ -31,32 +31,33 @@ RUN \ 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-openssl \ + php7-pcntl \ + php7-pdo_mysql \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pgsql \ + php7-posix \ + php7-sqlite3 \ + php7-xml \ + php7-xmlreader \ + php7-zip \ + php7-zlib \ samba \ sudo \ tar \ @@ -64,28 +65,29 @@ RUN \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - php5-memcached && \ + 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 && \ # configure php and nginx for nextcloud - echo "extension="smbclient.so"" >> /etc/php5/php.ini && \ + 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 && \ # cleanup rm -rf \ From c90b0ea6e31cd42e624379cddca0a28a39f1e79b Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 14 Feb 2017 20:53:27 +0000 Subject: [PATCH 2/7] fix cron job --- root/defaults/nextcloud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nextcloud b/root/defaults/nextcloud index 8bc040fe..e94b5554 100644 --- a/root/defaults/nextcloud +++ b/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 From d885fb23a735ad59c4b519a683a8157175e6bbbb Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 14 Feb 2017 22:45:07 +0000 Subject: [PATCH 3/7] remove dependencies already in baseimage --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bc9c2ca..1c59e965 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,6 @@ RUN \ php7-ldap \ php7-mbstring \ php7-mcrypt \ - php7-openssl \ php7-pcntl \ php7-pdo_mysql \ php7-pdo_pgsql \ @@ -57,7 +56,6 @@ RUN \ php7-xml \ php7-xmlreader \ php7-zip \ - php7-zlib \ samba \ sudo \ tar \ From 5dd81e69d0c2b106c5eae6103ba8753b27bfcb8e Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 28 Feb 2017 10:32:07 +0000 Subject: [PATCH 4/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c59e965..e27fdc38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" # package version -ENV NEXTCLOUD_VER="11.0.1" +ENV NEXTCLOUD_VER="11.0.2" # environment settings ENV NEXTCLOUD_PATH="/config/www/nextcloud" From 80f10d8104bd15277bd6cac37eb7edb1b29689ed Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 7 Mar 2017 23:43:55 +0000 Subject: [PATCH 5/7] Update README.md --- README.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c3b377ba..77ad4f9c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,77 @@ -![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/ -## 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 +[hub]: https://hub.docker.com/r/linuxserver/nextcloud/ + +[Nextcloud](https://nextcloud.com/) 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. + + + +[![sonarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nextcloud-icon.png)][sonarrurl] +[sonarrurl]: https://sonarr.tv/ + +## Usage + +``` +docker create \ + --name nextcloud \ + -p 443:443 \ + -e PUID= -e PGID= \ + -v :/config \ + -v :/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" TM. + +In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below: + +``` + $ id + uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) +``` + +## Setting up the application +Access the webui at `:443`, for more information check out [Nextcloud](https://nextcloud.com/). + +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`. + +## Changelog + ++ **07.03.17:** Release and upgrade to php7 and Alpine 3.5. From f096b1f5ea25e1c358a63b423f5b0622463cebc7 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 7 Mar 2017 23:45:59 +0000 Subject: [PATCH 6/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 77ad4f9c..b3cc8c32 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch -[![sonarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nextcloud-icon.png)][sonarrurl] -[sonarrurl]: https://sonarr.tv/ +[![nextcloud](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nextcloud-icon.png)][nextcloudurl] +[nextcloudurl]: https://nextcloud.com/ ## Usage From e26d5d82712cc04ee1281b00400d5edb308c2f3f Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 7 Mar 2017 23:51:53 +0000 Subject: [PATCH 7/7] update readme, add badges --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b3cc8c32..d32c73e4 100644 --- a/README.md +++ b/README.md @@ -11,16 +11,13 @@ 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/) [hub]: https://hub.docker.com/r/linuxserver/nextcloud/ -[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are. +[Nextcloud][nextcloudurl] 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)][nextcloudurl] [nextcloudurl]: https://nextcloud.com/ @@ -64,7 +61,7 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel ``` ## Setting up the application -Access the webui at `:443`, for more information check out [Nextcloud](https://nextcloud.com/). +Access the webui at `:443`, for more information check out [Nextcloud][nextcloudurl]. 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. @@ -72,6 +69,14 @@ Please note you will need a MySQL/MariaDB or other backend database to set this * Monitor the logs of the container in realtime `docker logs -f nextcloud`. -## Changelog +* 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 and upgrade to php7 and Alpine 3.5. ++ **07.03.17:** Release into main repository and upgrade to php7 and Alpine 3.5.