Bot Updating Package Versions

* php.ini and site config updates

* display real ip in nginx logs with rp

* fixed diffs w/ upstream nextcloud git (#129)

* Bot Updating Package Versions

* fixed diffs w/ nextcloud upstream

Edit line 53, 67 - ocs-provider + ocm-provider, one call:
https://github.com/nextcloud/documentation/commit/3206db9fb8290343753828b10f817cf066cf88bd
https://github.com/nextcloud/documentation/pull/1293

New line 55, edit 58 - try_files resets $fastcgi_path_info, fix so $path_info gets value:  
https://github.com/nextcloud/documentation/commit/8f6c1aa61aa3cd9d9e3e567c0afe4a822d3fc403
https://github.com/nextcloud/documentation/pull/1679

Co-authored-by: Evan Wade <evan+pgp@evanwade.com>

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: linuxserver

.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 -->

Dockerfile

@@ -1,11 +1,11 @@
-FROM lsiobase/nginx:3.10
+FROM lsiobase/nginx:3.11
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NEXTCLOUD_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 # environment settings
 ENV NEXTCLOUD_PATH="/config/www/nextcloud"
@@ -82,6 +82,9 @@ RUN \
 	-e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
 	-e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
 	-e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
+	-e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
+	-e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
+	-e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
 		/etc/php7/php.ini && \
  sed -i \
 	'/opcache.enable=1/a opcache.enable_cli=1' \

Dockerfile.aarch64

@@ -1,11 +1,11 @@
-FROM lsiobase/nginx:arm64v8-3.10
+FROM lsiobase/nginx:arm64v8-3.11
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NEXTCLOUD_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 # environment settings
 ENV NEXTCLOUD_PATH="/config/www/nextcloud"
@@ -82,6 +82,9 @@ RUN \
 	-e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
 	-e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
 	-e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
+	-e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
+	-e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
+	-e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
 		/etc/php7/php.ini && \
  sed -i \
 	'/opcache.enable=1/a opcache.enable_cli=1' \

Dockerfile.armhf

@@ -1,11 +1,11 @@
-FROM lsiobase/nginx:arm32v7-3.10
+FROM lsiobase/nginx:arm32v7-3.11
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG NEXTCLOUD_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 # environment settings
 ENV NEXTCLOUD_PATH="/config/www/nextcloud"
@@ -82,6 +82,9 @@ RUN \
 	-e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
 	-e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
 	-e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
+	-e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
+	-e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
+	-e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
 		/etc/php7/php.ini && \
  sed -i \
 	'/opcache.enable=1/a opcache.enable_cli=1' \

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')
@@ -10,6 +14,8 @@ pipeline {
   environment {
     BUILDS_DISCORD=credentials('build_webhook_url')
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
+    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
+    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-nextcloud'
@@ -49,14 +55,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.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -129,6 +128,9 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
@@ -147,6 +149,9 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
@@ -165,6 +170,9 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           } else {
@@ -220,32 +228,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}" ]; 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 --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
-                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}'''
@@ -272,6 +280,26 @@ pipeline {
         }
       }
     }
+    /* #######################
+           GitLab Mirroring
+       ####################### */
+    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    stage("GitLab Mirror"){
+      when {
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps{
+        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
+        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+             "name":"'${LS_REPO}'",
+             "mirror":true,\
+             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+             "issues_access_level":"disabled",\
+             "merge_requests_access_level":"disabled",\
+             "repository_access_level":"enabled",\
+             "visibility":"public"}' '''
+      } 
+    }
     /* ###############
        Build Container
        ############### */
@@ -503,19 +531,32 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
+          ],
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          echo 'Logging into DockerHub'
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                set -e
+                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                  docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                  docker push ${PUSHIMAGE}:latest
+                  docker push ${PUSHIMAGE}:${META_TAG}
+                done
+                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:${META_TAG} \
+                  ${DELETEIMAGE}:latest || :
+                done
              '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:${META_TAG}"
-          sh '''docker rmi \
-                ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest || :'''
-                
         }
       }
     }
@@ -532,46 +573,81 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
+          ],
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
           ]
         ]) {
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-             '''
-          sh '''#! /bin/bash
+                set -e
+                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                 if [ "${CI}" == "false" ]; then
                   docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                fi'''
-          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
-          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
-          sh "docker push ${IMAGE}:amd64-${META_TAG}"
-          sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
-          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-latest"
-          sh "docker push ${IMAGE}:arm32v7-latest"
-          sh "docker push ${IMAGE}:arm64v8-latest"
-          sh "docker manifest push --purge ${IMAGE}:latest || :"
-          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
-          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:latest"
-          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
-          sh '''docker rmi \
-                ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-latest \
-                ${IMAGE}:arm32v7-${META_TAG} \
-                ${IMAGE}:arm32v7-latest \
-                ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-latest \
+                fi
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
+                  docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
+                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                  docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
+                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
+                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                  docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                  docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                  docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                  docker push ${MANIFESTIMAGE}:amd64-latest
+                  docker push ${MANIFESTIMAGE}:arm32v7-latest
+                  docker push ${MANIFESTIMAGE}:arm64v8-latest
+                  docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                  docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
+                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                  docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                  docker manifest push --purge ${MANIFESTIMAGE}:latest
+                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                done
+                for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
+                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
+                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
+                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
+                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
+                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
+                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
+                  docker push ${LEGACYIMAGE}:amd64-${META_TAG}
+                  docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
+                  docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
+                  docker push ${LEGACYIMAGE}:latest
+                  docker push ${LEGACYIMAGE}:${META_TAG}
+                  docker push ${LEGACYIMAGE}:arm32v7-latest
+                  docker push ${LEGACYIMAGE}:arm64v8-latest
+                done
+             '''
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:amd64-${META_TAG} \
+                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-latest || :
+                done
+                docker rmi \
                 lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             '''
         }
       }
     }
@@ -655,16 +731,19 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
+    cleanup {
+      cleanWs()
+    }
   }
 }

README.md

@@ -1,5 +1,12 @@
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
+[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
+[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
 
  * regular and timely application updates
@@ -9,17 +16,24 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
  * regular security updates
 
 Find us at:
-* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
-* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
+* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
+* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
+* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
+* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
 
 # [linuxserver/nextcloud](https://github.com/linuxserver/docker-nextcloud)
-[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
-[![](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 version badge on microbadger.com")
-![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nextcloud.svg)
-![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg)
-[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-nextcloud/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/)
+
+[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nextcloud.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nextcloud)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nextcloud.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nextcloud/releases)
+[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nextcloud/packages)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-nextcloud/container_registry)
+[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nextcloud)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/nextcloud.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/nextcloud "Get your own version badge on microbadger.com")
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nextcloud.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/nextcloud)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/nextcloud)
+[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/)
 [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/nextcloud/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/nextcloud/latest/index.html)
 
 [Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.
@@ -31,7 +45,7 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). 
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
 Simply pulling `linuxserver/nextcloud` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
@@ -100,6 +114,18 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-v /config` | Nextcloud configs. |
 | `-v /data` | Your personal data. |
 
+## Environment variables from files (Docker secrets)
+
+You can set any environment variable from a file by using a special prepend `FILE__`. 
+
+As an example:
+
+```
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
+```
+
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+
 ## User / Group Identifiers
 
 When using 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`.
@@ -117,9 +143,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
 ```
@@ -131,17 +159,17 @@ Then restart the container to replace it with the latest one.
 
 * Shell access whilst the container is running: `docker exec -it nextcloud /bin/bash`
 * To monitor the logs of the container in realtime: `docker logs -f nextcloud`
-* container version number 
+* 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`
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.  
-  
-Below are the instructions for updating containers:  
-  
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+
+Below are the instructions for updating containers:
+
 ### Via Docker Run/Create
 * Update the image: `docker pull linuxserver/nextcloud`
 * Stop the running container: `docker stop nextcloud`
@@ -172,7 +200,7 @@ Below are the instructions for updating containers:
 
 ## Building locally
 
-If you want to make local modifications to these images for development purposes or just to customize the logic: 
+If you want to make local modifications to these images for development purposes or just to customize the logic:
 ```
 git clone https://github.com/linuxserver/docker-nextcloud.git
 cd docker-nextcloud
@@ -191,6 +219,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.01.20:** - Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **19.12.19:** - Rebasing to alpine 3.11.
+* **18.11.19:** - Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
+* **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,199 +1,201 @@
-alpine-baselayout-3.1.2-r0
+alpine-baselayout-3.2.0-r3
 alpine-keys-2.1-r2
-alsa-lib-1.1.9-r0
-apache2-utils-2.4.39-r0
-apk-tools-2.10.4-r1
-apr-1.6.5-r0
+alsa-lib-1.2.1.2-r0
+apache2-utils-2.4.41-r0
+apk-tools-2.10.4-r3
+apr-1.7.0-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
-c-client-2007f-r9
-ca-certificates-20190108-r0
-ca-certificates-cacert-20190108-r0
+argon2-libs-20190702-r1
+avahi-libs-0.7-r4
+bash-5.0.11-r1
+busybox-1.31.1-r9
+c-client-2007f-r11
+ca-certificates-20191127-r1
+ca-certificates-cacert-20191127-r1
 cairo-1.16.0-r2
 coreutils-8.31-r0
-cups-libs-2.2.11-r0
-curl-7.65.1-r0
+cups-libs-2.2.12-r1
+curl-7.67.0-r0
 db-5.3.28-r1
-dbus-libs-1.12.16-r0
-expat-2.2.7-r0
-ffmpeg-4.1.3-r1
-ffmpeg-libs-4.1.3-r1
-fontconfig-2.13.1-r0
-freetype-2.10.0-r0
-fribidi-1.0.5-r1
-gdk-pixbuf-2.38.1-r0
-ghostscript-9.27-r2
-git-2.22.0-r0
-glib-2.60.4-r0
+dbus-libs-1.12.16-r2
+expat-2.2.9-r1
+ffmpeg-4.2.1-r3
+ffmpeg-libs-4.2.1-r3
+fontconfig-2.13.1-r2
+freetype-2.10.1-r0
+fribidi-1.0.8-r0
+gdk-pixbuf-2.40.0-r0
+ghostscript-9.50-r0
+git-2.24.1-r0
+glib-2.62.6-r0
 gmp-6.1.2-r1
-gnutls-3.6.8-r0
+gnutls-3.6.10-r0
 graphite2-1.3.13-r1
-harfbuzz-2.5.1-r0
+harfbuzz-2.6.4-r0
 icu-libs-64.2-r0
-imagemagick-7.0.8.58-r0
-imagemagick-libs-7.0.8.58-r0
+imagemagick-7.0.9.7-r0
+imagemagick-libs-7.0.9.7-r0
 jansson-2.12-r0
-jbig2dec-0.16-r0
+jbig2dec-0.17-r0
 lame-3.100-r0
 lcms2-2.9-r1
-ldb-1.5.4-r0
-libacl-2.2.52-r6
-libarchive-3.3.3-r0
+ldb-2.0.8-r0
+libacl-2.2.53-r0
+libarchive-3.4.2-r0
 libass-0.14.0-r0
 libattr-2.4.48-r0
-libblkid-2.33.2-r0
-libbsd-0.9.1-r0
-libbz2-1.0.6-r7
-libc-utils-0.7.1-r0
+libblkid-2.34-r1
+libbsd-0.10.0-r0
+libbz2-1.0.8-r1
+libc-utils-0.7.2-r0
 libcap-2.27-r0
-libcom_err-1.45.2-r0
 libcroco-0.6.13-r1
-libcrypto1.1-1.1.1c-r0
-libcurl-7.65.1-r0
+libcrypto1.1-1.1.1d-r3
+libcurl-7.67.0-r0
 libde265-1.0.3-r0
-libdrm-2.4.98-r0
-libedit-20190324.3.1-r0
+libdrm-2.4.100-r0
+libedit-20191211.3.1-r0
 libffi-3.2.1-r6
-libgcc-8.3.0-r0
-libheif-1.3.2-r2
-libice-1.0.9-r3
-libintl-0.19.8.1-r4
-libjpeg-turbo-2.0.2-r0
-libldap-2.4.47-r2
-libltdl-2.4.6-r6
-libmagic-5.37-r0
+libgcc-9.2.0-r4
+libheif-1.6.0-r0
+libice-1.0.10-r0
+libintl-0.20.1-r2
+libjpeg-turbo-2.0.4-r0
+libldap-2.4.48-r1
+libltdl-2.4.6-r7
+libmagic-5.37-r1
 libmcrypt-2.5.8-r7
-libmemcached-libs-1.0.18-r3
-libmount-2.33.2-r0
-libogg-1.3.3-r2
-libpciaccess-0.14-r0
+libmemcached-libs-1.0.18-r4
+libmount-2.34-r1
+libogg-1.3.4-r0
+libpciaccess-0.16-r0
 libpng-1.6.37-r1
-libpq-11.5-r0
-libressl2.7-libcrypto-2.7.5-r0
-libressl2.7-libssl-2.7.5-r0
-librsvg-2.40.20-r0
-libsasl-2.1.27-r3
+libpq-12.2-r0
+libressl3.0-libcrypto-3.0.2-r0
+libressl3.0-libssl-3.0.2-r0
+librsvg-2.46.4-r0
+libsasl-2.1.27-r5
 libsm-1.2.3-r0
-libsmbclient-4.10.5-r0
+libsmbclient-4.11.5-r0
 libsodium-1.0.18-r0
-libssl1.1-1.1.1c-r0
-libstdc++-8.3.0-r0
-libtasn1-4.14-r0
+libssl1.1-1.1.1d-r3
+libstdc++-9.2.0-r4
+libtasn1-4.15.0-r0
 libtheora-1.1.1-r14
 libtls-standalone-2.9.1-r0
 libunistring-0.9.10-r0
-libuuid-2.33.2-r0
-libva-2.4.1-r0
-libvdpau-1.2-r0
+libuuid-2.34-r1
+libva-2.6.0-r0
+libvdpau-1.3-r0
 libvorbis-1.3.6-r2
-libvpx-1.8.0-r0
-libwbclient-4.10.5-r0
-libwebp-1.0.2-r0
-libx11-1.6.8-r0
+libvpx-1.8.1-r0
+libwbclient-4.11.5-r0
+libwebp-1.0.3-r0
+libx11-1.6.9-r0
 libxau-1.0.9-r0
 libxcb-1.13.1-r0
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
 libxft-2.3.3-r0
-libxml2-2.9.9-r2
-libxpm-3.5.12-r0
+libxml2-2.9.10-r2
+libxpm-3.5.13-r0
 libxrender-0.9.10-r3
-libxt-1.1.5-r2
+libxt-1.2.0-r0
 libzip-1.5.2-r0
-linux-pam-1.3.0-r1
-lmdb-0.9.23-r0
-logrotate-3.15.0-r0
-lz4-libs-1.9.1-r0
-musl-1.1.22-r3
-musl-utils-1.1.22-r2
-nano-4.3-r0
-ncurses-libs-6.1_p20190518-r0
-ncurses-terminfo-6.1_p20190518-r0
-ncurses-terminfo-base-6.1_p20190518-r0
-nettle-3.4.1-r1
-nghttp2-libs-1.38.0-r0
-nginx-1.16.0-r2
-openssl-1.1.1c-r0
+linux-pam-1.3.1-r1
+lmdb-0.9.24-r1
+logrotate-3.15.1-r0
+lz4-libs-1.9.2-r0
+musl-1.1.24-r2
+musl-utils-1.1.24-r1
+nano-4.6-r0
+ncurses-libs-6.1_p20200118-r2
+ncurses-terminfo-base-6.1_p20200118-r2
+nettle-3.5.1-r0
+nghttp2-libs-1.40.0-r0
+nginx-1.16.1-r6
+openssl-1.1.1d-r3
 opus-1.3.1-r0
-p11-kit-0.23.16.1-r0
-pango-1.42.4-r2
+p11-kit-0.23.18.1-r0
+pango-1.44.7-r0
 pcre-8.43-r0
-pcre2-10.33-r0
-php7-7.3.8-r0
-php7-bz2-7.3.8-r0
-php7-common-7.3.8-r0
-php7-ctype-7.3.8-r0
-php7-curl-7.3.8-r0
-php7-dom-7.3.8-r0
-php7-exif-7.3.8-r0
-php7-fileinfo-7.3.6-r0
-php7-fpm-7.3.6-r0
-php7-ftp-7.3.8-r0
-php7-gd-7.3.8-r0
-php7-gmp-7.3.8-r0
-php7-iconv-7.3.8-r0
-php7-imap-7.3.8-r0
-php7-intl-7.3.8-r0
-php7-json-7.3.6-r0
-php7-ldap-7.3.8-r0
-php7-mbstring-7.3.8-r0
-php7-mysqlnd-7.3.8-r0
-php7-opcache-7.3.8-r0
-php7-openssl-7.3.8-r0
-php7-pcntl-7.3.8-r0
-php7-pdo-7.3.8-r0
-php7-pdo_mysql-7.3.8-r0
-php7-pdo_pgsql-7.3.8-r0
-php7-pdo_sqlite-7.3.8-r0
-php7-pecl-apcu-5.1.17-r1
+pcre2-10.34-r1
+php7-7.3.16-r0
+php7-bz2-7.3.16-r0
+php7-common-7.3.16-r0
+php7-ctype-7.3.16-r0
+php7-curl-7.3.16-r0
+php7-dom-7.3.16-r0
+php7-exif-7.3.16-r0
+php7-fileinfo-7.3.15-r0
+php7-fpm-7.3.15-r0
+php7-ftp-7.3.16-r0
+php7-gd-7.3.16-r0
+php7-gmp-7.3.16-r0
+php7-iconv-7.3.16-r0
+php7-imap-7.3.16-r0
+php7-intl-7.3.16-r0
+php7-json-7.3.16-r0
+php7-ldap-7.3.16-r0
+php7-mbstring-7.3.16-r0
+php7-mysqlnd-7.3.16-r0
+php7-opcache-7.3.16-r0
+php7-openssl-7.3.16-r0
+php7-pcntl-7.3.16-r0
+php7-pdo-7.3.16-r0
+php7-pdo_mysql-7.3.16-r0
+php7-pdo_pgsql-7.3.16-r0
+php7-pdo_sqlite-7.3.16-r0
+php7-pecl-apcu-5.1.18-r0
 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.8-r0
-php7-phar-7.3.8-r0
-php7-posix-7.3.8-r0
-php7-session-7.3.8-r0
-php7-simplexml-7.3.6-r0
-php7-sodium-7.3.8-r0
-php7-sqlite3-7.3.8-r0
-php7-xml-7.3.6-r0
-php7-xmlreader-7.3.8-r0
-php7-xmlwriter-7.3.6-r0
-php7-zip-7.3.8-r0
+php7-pecl-imagick-3.4.4-r2
+php7-pecl-mcrypt-1.0.3-r0
+php7-pecl-memcached-3.1.5-r0
+php7-pecl-redis-5.1.1-r0
+php7-pgsql-7.3.16-r0
+php7-phar-7.3.16-r0
+php7-posix-7.3.16-r0
+php7-session-7.3.16-r0
+php7-simplexml-7.3.15-r0
+php7-sodium-7.3.16-r0
+php7-sqlite3-7.3.16-r0
+php7-xml-7.3.15-r0
+php7-xmlreader-7.3.16-r0
+php7-xmlwriter-7.3.15-r0
+php7-zip-7.3.16-r0
 pixman-0.38.4-r0
+pkgconf-1.6.3-r0
 popt-1.16-r7
-readline-8.0.0-r0
-samba-client-4.10.5-r0
-samba-client-libs-4.10.5-r0
-samba-common-4.10.5-r0
-samba-common-libs-4.10.5-r0
-samba-heimdal-libs-4.10.5-r0
-samba-libs-4.10.5-r0
-scanelf-1.2.3-r0
+readline-8.0.1-r0
+samba-client-4.11.5-r0
+samba-client-libs-4.11.5-r0
+samba-common-4.11.5-r0
+samba-common-libs-4.11.5-r0
+samba-common-server-libs-4.11.5-r0
+samba-heimdal-libs-4.11.5-r0
+samba-libs-4.11.5-r0
+samba-server-libs-4.11.5-r0
+scanelf-1.2.4-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
-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-r0
-tzdata-2019a-r0
+shadow-4.7-r1
+shared-mime-info-1.15-r0
+sqlite-libs-3.30.1-r1
+ssl_client-1.31.1-r9
+sudo-1.8.31-r0
+talloc-2.3.1-r0
+tar-1.32-r1
+tdb-libs-1.4.3-r0
+tevent-0.10.2-r0
+tiff-4.1.0-r0
+tzdata-2019c-r0
 unzip-6.0-r4
-v4l-utils-libs-1.16.6-r0
+v4l-utils-libs-1.18.0-r0
 wayland-libs-client-1.17.0-r0
-x264-libs-20180304-r1
-x265-libs-3.0-r0
-xvidcore-1.3.4-r1
+x264-libs-20191119-r0
+x265-libs-3.2.1-r0
+xvidcore-1.3.5-r0
 xz-5.2.4-r0
 xz-libs-5.2.4-r0
-zlib-1.2.11-r1
+zlib-1.2.11-r3
+zstd-libs-1.4.4-r1

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,11 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "17.01.20:", desc: "Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
+  - { date: "18.11.19:", desc: "Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
+  - { 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;
@@ -13,24 +13,40 @@ server {
     server_name _;
     ssl_certificate /config/keys/cert.crt;
     ssl_certificate_key /config/keys/cert.key;
+
+    # Add headers to serve security related headers
+    # Before enabling Strict-Transport-Security headers please read into this
+    # topic first.
+    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+    #
+    # WARNING: Only add the preload option once you read about
+    # the consequences in https://hstspreload.org/. This option
+    # will add the domain to a hardcoded list that is shipped
+    # in all major browsers and getting removed from this list
+    # could take several months.
+
     add_header X-Content-Type-Options nosniff;
     add_header X-XSS-Protection "1; mode=block";
     add_header X-Robots-Tag none;
     add_header X-Download-Options noopen;
+    add_header X-Frame-Options "SAMEORIGIN";
     add_header X-Permitted-Cross-Domain-Policies none;
     add_header Referrer-Policy no-referrer;
     fastcgi_hide_header X-Powered-By;
     root /config/www/nextcloud/;
+    # display real ip in nginx logs when connected through reverse proxy via docker network
+    set_real_ip_from 172.0.0.0/8;
+    real_ip_header X-Forwarded-For;
     location = /robots.txt {
         allow all;
         log_not_found off;
         access_log off;
     }
     location = /.well-known/carddav {
-      return 301 $scheme://$host/remote.php/dav;
+      return 301 $scheme://$host:$server_port/remote.php/dav;
     }
     location = /.well-known/caldav {
-      return 301 $scheme://$host/remote.php/dav;
+      return 301 $scheme://$host:$server_port/remote.php/dav;
     }
     client_max_body_size 10G;
     fastcgi_buffers 64 4K;
@@ -41,7 +57,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;
@@ -49,11 +65,13 @@ server {
     location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
         deny all;
     }
-    location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
+    location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
         fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
+        set $path_info $fastcgi_path_info;
+        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;
+        fastcgi_param PATH_INFO $path_info;
         fastcgi_param HTTPS on;
         fastcgi_param modHeadersAvailable true;
         fastcgi_param front_controller_active true;
@@ -61,23 +79,33 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
     }
-
-    location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {
+    location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
         try_files $uri/ =404;
         index index.php;
     }
-    location ~ \.(?:css|js|woff2?|svg|gif)$ {
+    location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
         try_files $uri /index.php$request_uri;
         add_header Cache-Control "public, max-age=15778463";
+        # Add headers to serve security related headers
+        # Before enabling Strict-Transport-Security headers please read into this
+        # topic first.
+        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+        #
+        # WARNING: Only add the preload option once you read about
+        # the consequences in https://hstspreload.org/. This option
+        # will add the domain to a hardcoded list that is shipped
+        # in all major browsers and getting removed from this list
+        # could take several months.
         add_header X-Content-Type-Options nosniff;
         add_header X-XSS-Protection "1; mode=block";
         add_header X-Robots-Tag none;
         add_header X-Download-Options noopen;
+        add_header X-Frame-Options "SAMEORIGIN";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header Referrer-Policy no-referrer;
         access_log off;
     }
-    location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
+    location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
         try_files $uri /index.php$request_uri;
         access_log off;
     }

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