Bot Updating Package Versions

Change cronjob to run every 5 minutes.

.github/ISSUE_TEMPLATE.md

@@ -1,21 +1,34 @@
-<!--- 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 -->
+If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
 
-<!---  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. -->
+<!--- Provide a general summary of the issue in the Title above -->
 
+------------------------------
 
-<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
+## Expected Behavior
+<!--- Tell us what should happen -->
 
-<!--- 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 ? -->
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
 
-##  Thanks, team linuxserver.io
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
 
+## Environment
+**OS:**      
+**CPU architecture:** x86_64/arm32/arm64      
+**How docker service was installed:**      
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Command used to create docker container (run/create/compose/screenshot)
+<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+
+## Docker logs
+<!--- Provide a full docker log, output of "docker logs nextcloud" -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,10 +6,34 @@
 
 <!--- 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 -->
+<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
+<!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  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 -->
-<!---  -->
+<!--- We maintain a changelog of major revisions to the container at the end of readme-vars.yml in the root of this repository, please add your changes there if appropriate -->
 
-##  Thanks, team linuxserver.io
 
+<!--- Coding guidelines: -->
+<!--- 1. Installed packages in the Dockerfiles should be in alphabetical order -->
+<!--- 2. Changes to Dockerfile should be replicated in Dockerfile.armhf and Dockerfile.aarch64 if applicable -->
+<!--- 3. Indentation style (tabs vs 4 spaces vs 1 space) should match the rest of the document -->
+<!--- 4. Readme is auto generated from readme-vars.yml, make your changes there -->
+
+------------------------------
+
+We welcome all PR’s though this doesn’t guarantee it will be accepted.
+
+## Description:
+<!--- Describe your changes in detail -->
+
+## Benefits of this PR and context:
+<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+
+## Source / References:
+<!--- Please include any forum posts/github links relevant to the PR -->

Jenkinsfile

@@ -2,6 +2,10 @@ pipeline {
   agent {
     label 'X86-64-MULTI'
   }
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60'))
+    parallelsAlwaysFailFast()
+  }
   // Input to determine if this is a package check
   parameters {
      string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
@@ -49,22 +53,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.LICENSE_TAG = sh(
-            script: '''#!/bin/bash
-                       if [ -e LICENSE ] ; then
-                         cat LICENSE | md5sum | cut -c1-8
-                       else
-                         echo none
-                       fi''',
-            returnStdout: true).trim()
-          env.FUNDING_TAG = sh(
-            script: '''#!/bin/bash
-                       if [ -e ./.github/FUNDING.yml ] ; then
-                         cat ./.github/FUNDING.yml | md5sum | cut -c1-8
-                       else
-                         echo none
-                       fi''',
-            returnStdout: true).trim()
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -228,35 +217,32 @@ pipeline {
               TEMPDIR=$(mktemp -d)
               docker pull linuxserver/jenkins-builder:latest
               docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
-              docker pull linuxserver/doc-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
-              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
-                 [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
-                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
-                 [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
-                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f master
+                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git add ${TEMPLATED_FILES}
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
               fi
               mkdir -p ${TEMPDIR}/gitbook
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                 cd ${TEMPDIR}/gitbook/docker-documentation/
                 git add images/docker-${CONTAINER_NAME}.md
-                git commit -m 'Bot Updating Templated Files'
+                git commit -m 'Bot Updating Documentation'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
               fi
               rm -Rf ${TEMPDIR}'''

README.md

@@ -127,9 +127,11 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel
  
 ## Application Setup
 
-Access the webui at `<your-ip>:443`, for more information check out [Nextcloud](https://nextcloud.com/).
+Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud](https://nextcloud.com/).
 
-If you are updating our container along with the in app updater and you are not customizing our default nginx configuration you will need to remove the file:
+In order to update nextcloud version, first make sure you are using the latest docker image, and then perform the in app gui update. Docker image update and recreation of container alone won't update nextcloud version. 
+
+If you are not customizing our default nginx configuration you will need to remove the file:
 ```
 /config/nginx/site-confs/default
 ```
@@ -201,6 +203,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.10.19:** - Change cronjob to run every 5 minutes.
+* **24.10.19:** - Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **14.07.19:** - Download nextcloud during build time.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

package_versions.txt

@@ -1,14 +1,14 @@
 alpine-baselayout-3.1.2-r0
 alpine-keys-2.1-r2
 alsa-lib-1.1.9-r0
-apache2-utils-2.4.39-r0
+apache2-utils-2.4.41-r0
 apk-tools-2.10.4-r2
 apr-1.6.5-r0
 apr-util-1.6.1-r6
 argon2-libs-20171227-r2
 avahi-libs-0.7-r2
 bash-5.0.0-r0
-busybox-1.30.1-r2
+busybox-1.30.1-r3
 c-client-2007f-r10
 ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
@@ -18,7 +18,7 @@ cups-libs-2.2.12-r0
 curl-7.66.0-r0
 db-5.3.28-r1
 dbus-libs-1.12.16-r0
-expat-2.2.7-r1
+expat-2.2.8-r0
 ffmpeg-4.1.4-r0
 ffmpeg-libs-4.1.4-r0
 fontconfig-2.13.1-r0
@@ -49,7 +49,7 @@ libbsd-0.9.1-r0
 libbz2-1.0.6-r7
 libc-utils-0.7.1-r0
 libcap-2.27-r0
-libcom_err-1.45.2-r0
+libcom_err-1.45.2-r1
 libcroco-0.6.13-r1
 libcrypto1.1-1.1.1d-r0
 libcurl-7.66.0-r0
@@ -64,7 +64,7 @@ libintl-0.19.8.1-r4
 libjpeg-turbo-2.0.2-r0
 libldap-2.4.48-r0
 libltdl-2.4.6-r6
-libmagic-5.37-r0
+libmagic-5.37-r1
 libmcrypt-2.5.8-r7
 libmemcached-libs-1.0.18-r3
 libmount-2.33.2-r0
@@ -116,56 +116,56 @@ ncurses-terminfo-6.1_p20190518-r0
 ncurses-terminfo-base-6.1_p20190518-r0
 nettle-3.4.1-r1
 nghttp2-libs-1.39.2-r0
-nginx-1.16.1-r0
-openssl-1.1.1c-r0
+nginx-1.16.1-r1
+openssl-1.1.1d-r0
 opus-1.3.1-r0
 p11-kit-0.23.16.1-r0
 pango-1.42.4-r2
 pcre-8.43-r0
 pcre2-10.33-r0
-php7-7.3.9-r0
-php7-bz2-7.3.9-r0
-php7-common-7.3.9-r0
-php7-ctype-7.3.9-r0
-php7-curl-7.3.9-r0
-php7-dom-7.3.9-r0
-php7-exif-7.3.9-r0
-php7-fileinfo-7.3.8-r0
-php7-fpm-7.3.8-r0
-php7-ftp-7.3.9-r0
-php7-gd-7.3.9-r0
-php7-gmp-7.3.9-r0
-php7-iconv-7.3.9-r0
-php7-imap-7.3.9-r0
-php7-intl-7.3.9-r0
-php7-json-7.3.8-r0
-php7-ldap-7.3.9-r0
-php7-mbstring-7.3.9-r0
-php7-mysqlnd-7.3.9-r0
-php7-opcache-7.3.9-r0
-php7-openssl-7.3.9-r0
-php7-pcntl-7.3.9-r0
-php7-pdo-7.3.9-r0
-php7-pdo_mysql-7.3.9-r0
-php7-pdo_pgsql-7.3.9-r0
-php7-pdo_sqlite-7.3.9-r0
+php7-7.3.11-r0
+php7-bz2-7.3.11-r0
+php7-common-7.3.11-r0
+php7-ctype-7.3.11-r0
+php7-curl-7.3.11-r0
+php7-dom-7.3.11-r0
+php7-exif-7.3.11-r0
+php7-fileinfo-7.3.11-r0
+php7-fpm-7.3.11-r0
+php7-ftp-7.3.11-r0
+php7-gd-7.3.11-r0
+php7-gmp-7.3.11-r0
+php7-iconv-7.3.11-r0
+php7-imap-7.3.11-r0
+php7-intl-7.3.11-r0
+php7-json-7.3.11-r0
+php7-ldap-7.3.11-r0
+php7-mbstring-7.3.11-r0
+php7-mysqlnd-7.3.11-r0
+php7-opcache-7.3.11-r0
+php7-openssl-7.3.11-r0
+php7-pcntl-7.3.11-r0
+php7-pdo-7.3.11-r0
+php7-pdo_mysql-7.3.11-r0
+php7-pdo_pgsql-7.3.11-r0
+php7-pdo_sqlite-7.3.11-r0
 php7-pecl-apcu-5.1.17-r1
 php7-pecl-igbinary-3.0.1-r1
 php7-pecl-imagick-3.4.4-r1
 php7-pecl-mcrypt-1.0.2-r1
 php7-pecl-memcached-3.1.3-r2
 php7-pecl-redis-4.3.0-r2
-php7-pgsql-7.3.9-r0
-php7-phar-7.3.9-r0
-php7-posix-7.3.9-r0
-php7-session-7.3.9-r0
-php7-simplexml-7.3.8-r0
-php7-sodium-7.3.9-r0
-php7-sqlite3-7.3.9-r0
-php7-xml-7.3.8-r0
-php7-xmlreader-7.3.9-r0
-php7-xmlwriter-7.3.8-r0
-php7-zip-7.3.9-r0
+php7-pgsql-7.3.11-r0
+php7-phar-7.3.11-r0
+php7-posix-7.3.11-r0
+php7-session-7.3.11-r0
+php7-simplexml-7.3.11-r0
+php7-sodium-7.3.11-r0
+php7-sqlite3-7.3.11-r0
+php7-xml-7.3.11-r0
+php7-xmlreader-7.3.11-r0
+php7-xmlwriter-7.3.11-r0
+php7-zip-7.3.11-r0
 pixman-0.38.4-r0
 popt-1.16-r7
 readline-8.0.0-r0
@@ -179,15 +179,15 @@ scanelf-1.2.3-r0
 sdl2-2.0.10-r0
 shadow-4.6-r2
 shared-mime-info-1.12-r0
-sqlite-libs-3.28.0-r0
-ssl_client-1.30.1-r2
+sqlite-libs-3.28.0-r1
+ssl_client-1.30.1-r3
 sudo-1.8.27-r0
 talloc-2.2.0-r0
 tar-1.32-r0
 tdb-libs-1.3.18-r0
 tevent-0.9.39-r0
 tiff-4.0.10-r1
-tzdata-2019a-r0
+tzdata-2019c-r0
 unzip-6.0-r4
 v4l-utils-libs-1.16.6-r0
 wayland-libs-client-1.17.0-r0

readme-vars.yml

@@ -48,9 +48,11 @@ optional_block_1: false
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  Access the webui at `<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).
+  Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).
 
-  If you are updating our container along with the in app updater and you are not customizing our default nginx configuration you will need to remove the file:
+  In order to update nextcloud version, first make sure you are using the latest docker image, and then perform the in app gui update. Docker image update and recreation of container alone won't update nextcloud version. 
+  
+  If you are not customizing our default nginx configuration you will need to remove the file:
   ```
   /config/nginx/site-confs/default
   ```
@@ -58,6 +60,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.10.19:", desc: "Change cronjob to run every 5 minutes." }
+  - { date: "24.10.19:", desc: "Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
   - { date: "14.07.19:", desc: "Download nextcloud during build time." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

root/defaults/default

@@ -5,7 +5,7 @@ server {
     listen 80;
     listen [::]:80;
     server_name _;
-    return 301 https://$server_name$request_uri;
+    return 301 https://$host$request_uri;
 }
 server {
     listen 443 ssl http2;
@@ -41,7 +41,7 @@ server {
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
     gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
     location / {
-        rewrite ^ /index.php$request_uri;
+        rewrite ^ /index.php;
     }
     location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
         deny all;
@@ -51,6 +51,7 @@ server {
     }
     location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
         fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
+        try_files $fastcgi_script_name =404;
         include /etc/nginx/fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;

root/defaults/nextcloud

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