Bot Updating Package Versions

occ & updater.phar

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver

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

@@ -14,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'
@@ -126,6 +128,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
+          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 {
@@ -144,6 +148,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
+          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 {
@@ -162,6 +168,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
+          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 {
@@ -269,6 +277,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
        ############### */
@@ -316,7 +344,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm32v7-${META_TAG} \
                     lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -343,7 +373,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm64v8-${META_TAG} \
                     lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -502,17 +534,27 @@ pipeline {
             passwordVariable: 'DOCKERPASS'
           ]
         ]) {
-          echo 'Logging into DockerHub'
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  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 "${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
+               '''
+          }
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                for DELETEIMAGE in "${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 || :'''
-                
         }
       }
     }
@@ -531,44 +573,72 @@ pipeline {
             passwordVariable: 'DOCKERPASS'
           ]
         ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  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
+                  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
+                  docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
+                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
+                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
+                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker push ${GITHUBIMAGE}:latest
+                  docker push ${GITHUBIMAGE}:${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-latest
+                  docker push ${GITHUBIMAGE}:arm64v8-latest
+               '''
+          }
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-             '''
-          sh '''#! /bin/bash
-                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 \
+                for DELETEIMAGE in "${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} || :
+             '''
         }
       }
     }
@@ -652,16 +722,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,13 +1,13 @@
 [![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.")
-[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
-[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](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 :-
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
  * regular and timely application updates
  * easy user mappings (PGID, PUID)
@@ -20,17 +20,20 @@ Find us at:
 * [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.
-* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
+* [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)
-[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nextcloud.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-nextcloud/releases)
-[![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")
-[![MicroBadger Size](https://img.shields.io/microbadger/image-size/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)](https://hub.docker.com/r/linuxserver/nextcloud)
-[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg?style=flat-square&color=E68523)](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)
+
+[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nextcloud)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nextcloud/releases)
+[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-nextcloud/packages)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-nextcloud/container_registry)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-nextcloud%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fnextcloud%2Flatest%2Fci-status.yml)](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.
 
@@ -67,8 +70,8 @@ docker create \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -p 443:443 \
-  -v </path/to/appdata>:/config \
-  -v <path/to/data>:/data \
+  -v /path/to/appdata:/config \
+  -v /path/to/data:/data \
   --restart unless-stopped \
   linuxserver/nextcloud
 ```
@@ -80,7 +83,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   nextcloud:
     image: linuxserver/nextcloud
@@ -90,8 +93,8 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-      - </path/to/appdata>:/config
-      - <path/to/data>:/data
+      - /path/to/appdata:/config
+      - /path/to/data:/data
     ports:
       - 443:443
     restart: unless-stopped
@@ -110,6 +113,23 @@ 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.
+
+## Umask for running applications
+
+For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
+Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
+
 ## 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`.
@@ -129,7 +149,15 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel
 
 Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud](https://nextcloud.com/).
 
-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. 
+Docker image update and recreation of container alone won't update nextcloud version. 
+
+In order to update nextcloud version, you have two options, firstly make sure you are using the latest docker image,then either 
+
+1.  Perform the in app gui update. 
+2.  Use the CLI version by running `docker exec -it nextcloud updater.phar`
+ (Both of these are described [here](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/update.html))
+
+Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u abc php` or `sudo -u www-data php`
 
 If you are not customizing our default nginx configuration you will need to remove the file:
 ```
@@ -138,6 +166,11 @@ If you are not customizing our default nginx configuration you will need to remo
 Then restart the container to replace it with the latest one. 
 
 
+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27nextcloud%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=nextcloud "view available mods for this container.")
+
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
+
 
 ## Support Info
 
@@ -203,6 +236,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.20:** - Add aliases for occ and updater.phar
+* **31.03.20:** - Allow crontab to be user customized, fix logrotate.
+* **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.

package_versions.txt

@@ -1,199 +1,203 @@
-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.41-r0
-apk-tools-2.10.4-r2
-apr-1.6.5-r0
+alsa-lib-1.2.1.2-r0
+apache2-utils-2.4.43-r0
+apk-tools-2.10.5-r0
+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-r3
-c-client-2007f-r10
-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.12-r0
-curl-7.66.0-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.8-r0
-ffmpeg-4.1.4-r0
-ffmpeg-libs-4.1.4-r0
-fontconfig-2.13.1-r0
-freetype-2.10.0-r0
-fribidi-1.0.5-r1
-gdk-pixbuf-2.38.1-r0
-ghostscript-9.27-r4
-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.3-r0
+glib-2.62.6-r0
 gmp-6.1.2-r1
-gnutls-3.6.8-r0
+gnutls-3.6.10-r1
 graphite2-1.3.13-r1
-harfbuzz-2.5.1-r0
-icu-libs-64.2-r0
-imagemagick-7.0.8.58-r0
-imagemagick-libs-7.0.8.58-r0
+harfbuzz-2.6.4-r0
+icu-libs-64.2-r1
+imagemagick-7.0.9.7-r0
+imagemagick-libs-7.0.9.7-r0
 jansson-2.12-r0
-jbig2dec-0.16-r0
+jbig2dec-0.17-r2
 lame-3.100-r0
 lcms2-2.9-r1
-ldb-1.5.5-r0
-libacl-2.2.52-r6
-libarchive-3.3.3-r0
+ldb-2.0.10-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-r1
 libcroco-0.6.13-r1
-libcrypto1.1-1.1.1d-r0
-libcurl-7.66.0-r0
+libcrypto1.1-1.1.1g-r0
+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.48-r0
-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-r2
+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-r1
-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
+libproc-3.3.16-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.8-r0
+libsmbclient-4.11.8-r0
 libsodium-1.0.18-r0
-libssl1.1-1.1.1d-r0
-libstdc++-8.3.0-r0
-libtasn1-4.14-r0
+libssl1.1-1.1.1g-r0
+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.8-r0
-libwebp-1.0.2-r0
-libx11-1.6.8-r1
+libvpx-1.8.1-r0
+libwbclient-4.11.8-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-r3
+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.24-r0
-logrotate-3.15.0-r0
-lz4-libs-1.9.1-r0
-musl-1.1.22-r3
-musl-utils-1.1.22-r3
-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.39.2-r0
-nginx-1.16.1-r1
-openssl-1.1.1d-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-r2
+nano-4.6-r0
+ncurses-libs-6.1_p20200118-r4
+ncurses-terminfo-base-6.1_p20200118-r4
+nettle-3.5.1-r0
+nghttp2-libs-1.40.0-r0
+nginx-1.16.1-r6
+openssl-1.1.1g-r0
 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.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
+pcre2-10.34-r1
+php7-7.3.18-r0
+php7-bz2-7.3.18-r0
+php7-common-7.3.18-r0
+php7-ctype-7.3.18-r0
+php7-curl-7.3.18-r0
+php7-dom-7.3.18-r0
+php7-exif-7.3.18-r0
+php7-fileinfo-7.3.18-r0
+php7-fpm-7.3.18-r0
+php7-ftp-7.3.18-r0
+php7-gd-7.3.18-r0
+php7-gmp-7.3.18-r0
+php7-iconv-7.3.18-r0
+php7-imap-7.3.18-r0
+php7-intl-7.3.18-r0
+php7-json-7.3.18-r0
+php7-ldap-7.3.18-r0
+php7-mbstring-7.3.18-r0
+php7-mysqlnd-7.3.18-r0
+php7-opcache-7.3.18-r0
+php7-openssl-7.3.18-r0
+php7-pcntl-7.3.18-r0
+php7-pdo-7.3.18-r0
+php7-pdo_mysql-7.3.18-r0
+php7-pdo_pgsql-7.3.18-r0
+php7-pdo_sqlite-7.3.18-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.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
+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.18-r0
+php7-phar-7.3.18-r0
+php7-posix-7.3.18-r0
+php7-session-7.3.18-r0
+php7-simplexml-7.3.18-r0
+php7-sodium-7.3.18-r0
+php7-sqlite3-7.3.18-r0
+php7-xml-7.3.18-r0
+php7-xmlreader-7.3.18-r0
+php7-xmlwriter-7.3.18-r0
+php7-zip-7.3.18-r0
 pixman-0.38.4-r0
+pkgconf-1.6.3-r0
 popt-1.16-r7
-readline-8.0.0-r0
-samba-client-4.10.8-r0
-samba-client-libs-4.10.8-r0
-samba-common-4.10.8-r0
-samba-common-libs-4.10.8-r0
-samba-heimdal-libs-4.10.8-r0
-samba-libs-4.10.8-r0
-scanelf-1.2.3-r0
+procps-3.3.16-r0
+readline-8.0.1-r0
+samba-client-4.11.8-r0
+samba-client-libs-4.11.8-r0
+samba-common-4.11.8-r0
+samba-common-libs-4.11.8-r0
+samba-common-server-libs-4.11.8-r0
+samba-heimdal-libs-4.11.8-r0
+samba-libs-4.11.8-r0
+samba-server-libs-4.11.8-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-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-2019c-r0
-unzip-6.0-r4
-v4l-utils-libs-1.16.6-r0
+shadow-4.7-r1
+shared-mime-info-1.15-r0
+sqlite-libs-3.30.1-r2
+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-2020a-r0
+unzip-6.0-r6
+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

@@ -29,8 +29,8 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata>", desc: "Nextcloud configs." }
-  - { vol_path: "/data", vol_host_path: "<path/to/data>", desc: "Your personal data." }
+  - { vol_path: "/config", vol_host_path: "/path/to/appdata", desc: "Nextcloud configs." }
+  - { vol_path: "/data", vol_host_path: "/path/to/data", desc: "Your personal data." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "443", internal_port: "443", port_desc: "WebUI" }
@@ -50,7 +50,15 @@ app_setup_block_enabled: true
 app_setup_block: |
   Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).
 
-  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. 
+  Docker image update and recreation of container alone won't update nextcloud version. 
+
+  In order to update nextcloud version, you have two options, firstly make sure you are using the latest docker image,then either 
+  
+  1.  Perform the in app gui update. 
+  2.  Use the CLI version by running `docker exec -it nextcloud updater.phar`
+   (Both of these are described [here](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/update.html))
+
+  Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u abc php` or `sudo -u www-data php`
   
   If you are not customizing our default nginx configuration you will need to remove the file:
   ```
@@ -58,8 +66,15 @@ app_setup_block: |
   ```
   Then restart the container to replace it with the latest one. 
 
+  
+
 # changelog
 changelogs:
+  - { date: "31.05.20:", desc: "Add aliases for occ and updater.phar" }
+  - { date: "31.03.20:", desc: "Allow crontab to be user customized, fix logrotate." }
+  - { 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." }

root/defaults/default

@@ -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;
@@ -49,12 +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;
@@ -62,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 +0,0 @@
-*/5  *  *  *  * s6-setuidgid abc php7 -f /config/www/nextcloud/cron.php

root/defaults/root

@@ -0,0 +1,9 @@
+# do daily/weekly/monthly maintenance
+# min   hour    day     month   weekday command
+*/15    *       *       *       *       run-parts /etc/periodic/15min
+0       *       *       *       *       run-parts /etc/periodic/hourly
+0       2       *       *       *       run-parts /etc/periodic/daily
+0       3       *       *       6       run-parts /etc/periodic/weekly
+0       5       1       *       *       run-parts /etc/periodic/monthly
+# nextcloud cron
+*/5     *       *       *       *       s6-setuidgid abc php7 -f /config/www/nextcloud/cron.php

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

@@ -2,7 +2,8 @@
 
 # create folders
 mkdir -p \
-	"${NEXTCLOUD_PATH}"
+	"${NEXTCLOUD_PATH}" \
+	/config/crontabs
 
 # install app
 if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
@@ -14,4 +15,6 @@ if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
 fi
 
 # set cronjob
-crontab /defaults/nextcloud
+[[ ! -f /config/crontabs/root ]] && \
+	cp /defaults/root /config/crontabs/root
+cp /config/crontabs/root /etc/crontabs/root

root/etc/cont-init.d/70-aliases

@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+## Set alias for occ and make executable
+[[ ! -f /usr/bin/occ ]] && \
+  echo -e '#!/bin/bash\nsudo -u abc php7 /config/www/nextcloud/occ' > /usr/bin/occ
+
+[[ ! -x /usr/bin/occ ]] && \
+  chmod +x /usr/bin/occ
+
+## Set alias for updater.phar and make executable
+[[ ! -f /usr/bin/updater.phar ]] && \
+  echo -e '#!/bin/bash\nsudo -u abc php7 /config/www/nextcloud/updater/updater.phar' > /usr/bin/updater.phar
+
+[[ ! -x /usr/bin/updater.phar ]] && \
+  chmod +x /usr/bin/updater.phar