Bot Updating Package Versions

Bot Updating Templated Files
2026-06-03 09:57:35 +00:00 · 2025-02-11 11:53:36 +00:00 · 2025-02-11 11:48:30 +00:00 · 2025-02-06 16:46:50 +00:00 · 2025-01-30 15:41:23 +00:00 · 2025-01-30 15:36:37 +00:00
33 changed files with 1737 additions and 1175 deletions
@@ -6,7 +6,7 @@
 * Read, and fill the Pull Request template
  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)

 ## Common files

@@ -24,7 +24,7 @@
 ## Readme

 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-nextcloud/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-nextcloud/edit/develop/readme-vars.yml).

 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-nextcloud)
@@ -105,17 +105,17 @@ docker build \
  -t linuxserver/nextcloud:latest .
 ```

-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```

 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

 ## Update the changelog

-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-nextcloud/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-nextcloud/tree/develop/root), add an entry to the changelog

 ```yml
 changelogs:
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
+    url: https://linuxserver.io/discord
    about: Realtime support / chat with the community and the team.

  - name: Discourse discussion forum
@@ -53,7 +53,6 @@ body:
      options:
        - x86-64
        - arm64
-        - armhf
    validations:
      required: true
  - type: textarea
@@ -68,10 +67,10 @@ body:
  - type: textarea
    attributes:
      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs nextcloud"
      label: Container logs
      placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs nextcloud`
      render: bash
    validations:
      required: true
@@ -21,7 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

 ------------------------------

@@ -4,26 +4,39 @@ on:
  workflow_dispatch:

 jobs:
-  external-trigger-master:
+  external-trigger-develop:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+          printf "# External trigger for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
+          if grep -q "^nextcloud_develop_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_develop_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
+          elif grep -q "^nextcloud_develop" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_develop\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of develop branch. To disable this trigger, add \`nextcloud_develop\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
+          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
+          if grep -q "^nextcloud_develop_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\". ****"
-          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for nextcloud branch master"
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve external version for nextcloud branch develop"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-nextcloud/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -31,24 +44,42 @@ jobs:
            exit 1
          fi
          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
+          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
          image="linuxserver/nextcloud"
-          tag="latest"
+          tag="develop"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fnextcloud%3Apull" \
            | jq -r '.token')
-            multidigest=$(curl -s \
+          multidigest=$(curl -s \
+            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Authorization: Bearer ${token}" \
+            "https://ghcr.io/v2/${image}/manifests/${tag}")
+          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+            # If there's a layer element it's a single-arch manifest so just get that digest
+            digest=$(jq -r '.config.digest' <<< "${multidigest}")
+          else
+            # Otherwise it's multi-arch or has manifest annotations
+            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+              # Check for manifest annotations and delete if found
+              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
+            fi
+            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
+              # If there's still more than one digest, it's multi-arch
+              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
+            else
+              # Otherwise it's single arch
+              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
+            fi
+            if digest=$(curl -s \
              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
-            digest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
+              digest=$(jq -r '.config.digest' <<< "${digest}");
+            fi
+          fi
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
            "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -60,45 +91,54 @@ jobs:
          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
-            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag latest"
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag develop"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            echo "**** Sleeping 10 seconds until job starts ****"
-            sleep 10
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
-            curl -iX POST \
-              "${buildurl}submitDescription" \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-              --data-urlencode "Submit=Submit"
-            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for nextcloud tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ "${artifacts_found}" == "false" ]]; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
+              FAILURE_REASON="New version ${EXT_RELEASE} for nextcloud tag develop is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            else
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              if [[ "${artifacts_found}" == "true" ]]; then
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
+              fi
+              response=$(curl -iX POST \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/buildWithParameters?PACKAGE_CHECK=false \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+              sleep 10
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              buildurl="${buildurl%$'\r'}"
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+              curl -iX POST \
+                "${buildurl}submitDescription" \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                --data-urlencode "Submit=Submit"
+              echo "**** Notifying Discord ****"
+              TRIGGER_REASON="A version change was detected for nextcloud tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            fi
          fi
@@ -9,37 +9,37 @@ jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

      - name: External Trigger Scheduler
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# External trigger scheduler for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml)
            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
                  -d "{\"ref\":\"refs/heads/${br}\"}" \
                  https://api.github.com/repos/linuxserver/docker-nextcloud/actions/workflows/external_trigger.yml/dispatches
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
            fi
          done
@@ -9,5 +9,5 @@ jobs:
    - uses: actions/first-interaction@v1
      with:
        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
-            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\". ****"
-          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=true \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-          echo "**** Sleeping 10 seconds until job starts ****"
-          sleep 10
-          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-          buildurl="${buildurl%$'\r'}"
-          echo "**** Jenkins job build url: ${buildurl} ****"
-          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Attempting to change the Jenkins job description ****"
-          curl -iX POST \
-            "${buildurl}submitDescription" \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --data-urlencode "Submit=Submit"
@@ -9,42 +9,92 @@ jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

      - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# Package trigger scheduler for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml | yq -r '.ls_branch')
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-nextcloud/actions/workflows/package_trigger.yml/dispatches
-                sleep 30
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml)
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/Jenkinsfile >/dev/null 2>&1; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
+              skipped_branches="${skipped_branches}${br} "
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/readme-vars.yml)
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif grep -q "^nextcloud_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`nextcloud_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                printf "> To disable, add \`nextcloud_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
+                triggered_branches="${triggered_branches}${br} "
+                response=$(curl -iX POST \
+                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                if [[ -z "${response}" ]]; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Jenkins build could not be triggered. Skipping branch."
+                  continue
+                fi
+                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                sleep 10
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                buildurl="${buildurl%$'\r'}"
+                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                if ! curl -ifX POST \
+                  "${buildurl}submitDescription" \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                  --data-urlencode "Submit=Submit"; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Unable to change the Jenkins job description."
+                fi
+                sleep 20
              fi
            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
            fi
          done
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-          echo "**** Notifying Discord ****"
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for nextcloud** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-nextcloud/activity/"' \n"}],
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+            if [[ -n "${triggered_branches}" ]]; then
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-nextcloud/activity/ \n"
+              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            fi
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) for nextcloud** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi
@@ -5,6 +5,8 @@ on:
      - '**/run'
      - '**/finish'
      - '**/check'
+      - 'root/migrations/*'
+
 jobs:
  permission_check:
    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20

 # set version label
 ARG BUILD_DATE
@@ -14,79 +14,85 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
+    php83-apcu \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pcntl \
+    php83-pdo_mysql \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pecl-imagick \
+    php83-pecl-mcrypt \
+    php83-pecl-memcached \
+    php83-pecl-smbclient \
+    php83-pgsql \
+    php83-posix \
+    php83-redis \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-sysvsem \
+    php83-xmlreader \
+    rsync \
    samba-client \
    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php81-pecl-smbclient && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
-  sed -i \
-    -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
-    -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
-    -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
-    -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
-    -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' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
-  sed -i \
-    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
-  echo "**** set version tag ****" && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  echo "**** configure php for nextcloud ****" && \
+  { \
+    echo 'apc.enable_cli=1'; \
+  } >> /etc/php83/conf.d/apcu.ini && \
+  { \
+    echo 'opcache.enable=1'; \
+    echo 'opcache.interned_strings_buffer=32'; \
+    echo 'opcache.max_accelerated_files=10000'; \
+    echo 'opcache.memory_consumption=128'; \
+    echo 'opcache.save_comments=1'; \
+    echo 'opcache.revalidate_freq=60'; \
+    echo 'opcache.jit=1255'; \
+    echo 'opcache.jit_buffer_size=128M'; \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
+  { \
+    echo 'memory_limit=-1'; \
+    echo 'upload_max_filesize=100G'; \
+    echo 'post_max_size=100G'; \
+    echo 'max_input_time=3600'; \
+    echo 'max_execution_time=3600'; \
+    echo 'output_buffering=0'; \
+    echo 'always_populate_raw_post_data=-1'; \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
+  echo "**** install nextcloud ****" && \
+  mkdir -p \
+    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
-  echo "**** download nextcloud ****" && \
-  curl -o /app/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
+  curl -o \
+    /tmp/nextcloud.tar.bz2 -L \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+  tar xf /tmp/nextcloud.tar.bz2 -C \
+    /app/www/src --strip-components=1 && \
+  rm -rf /app/www/src/updater && \
+  mkdir -p /app/www/src/data && \
+  chmod +x /app/www/src/occ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20

 # set version label
 ARG BUILD_DATE
@@ -14,79 +14,85 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
+    php83-apcu \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pcntl \
+    php83-pdo_mysql \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pecl-imagick \
+    php83-pecl-mcrypt \
+    php83-pecl-memcached \
+    php83-pecl-smbclient \
+    php83-pgsql \
+    php83-posix \
+    php83-redis \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-sysvsem \
+    php83-xmlreader \
+    rsync \
    samba-client \
    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php81-pecl-smbclient && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
-  sed -i \
-    -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
-    -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
-    -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
-    -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
-    -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' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
-  sed -i \
-    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
-  echo "**** set version tag ****" && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  echo "**** configure php for nextcloud ****" && \
+  { \
+    echo 'apc.enable_cli=1'; \
+  } >> /etc/php83/conf.d/apcu.ini && \
+  { \
+    echo 'opcache.enable=1'; \
+    echo 'opcache.interned_strings_buffer=32'; \
+    echo 'opcache.max_accelerated_files=10000'; \
+    echo 'opcache.memory_consumption=128'; \
+    echo 'opcache.save_comments=1'; \
+    echo 'opcache.revalidate_freq=60'; \
+    echo 'opcache.jit=1255'; \
+    echo 'opcache.jit_buffer_size=128M'; \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
+  { \
+    echo 'memory_limit=-1'; \
+    echo 'upload_max_filesize=100G'; \
+    echo 'post_max_size=100G'; \
+    echo 'max_input_time=3600'; \
+    echo 'max_execution_time=3600'; \
+    echo 'output_buffering=0'; \
+    echo 'always_populate_raw_post_data=-1'; \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
+  echo "**** install nextcloud ****" && \
+  mkdir -p \
+    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
-  echo "**** download nextcloud ****" && \
-  curl -o /app/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
+  curl -o \
+    /tmp/nextcloud.tar.bz2 -L \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+  tar xf /tmp/nextcloud.tar.bz2 -C \
+    /app/www/src --strip-components=1 && \
+  rm -rf /app/www/src/updater && \
+  mkdir -p /app/www/src/data && \
+  chmod +x /app/www/src/occ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
@@ -1,99 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG NEXTCLOUD_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
-
-# environment settings
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
-
-RUN \
-  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
-    ffmpeg \
-    gnu-libiconv \
-    imagemagick \
-    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
-    samba-client \
-    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php81-pecl-smbclient && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
-  sed -i \
-    -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
-    -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
-    -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
-    -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
-    -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' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
-  sed -i \
-    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
-  echo "**** set version tag ****" && \
-  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
-      | sed 's|^v||g' | sort -rV | head -1); \
-  fi && \
-  echo "**** download nextcloud ****" && \
-  curl -o /app/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /tmp/*
-
-# copy local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 80 443
-VOLUME /config
@@ -1,10 +1,9 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- Please read https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/CONTRIBUTING.md -->
 [![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?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.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "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.")
@@ -21,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 Find us at:

 * [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.
+* [Discord](https://linuxserver.io/discord) - 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.
@@ -29,7 +28,7 @@ Find us at:

 # [linuxserver/nextcloud](https://github.com/linuxserver/docker-nextcloud)

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnextcloud?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fnextcloud)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnextcloud?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![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)
@@ -37,8 +36,8 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nextcloud)
 [![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%2Fci-tests.linuxserver.io%2Flinuxserver%2Fnextcloud%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/latest/index.html)
+[![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%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/)
+[![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%2Fci-tests.linuxserver.io%2Flinuxserver%2Fnextcloud%2Fdevelop%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/develop/index.html)

 [Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.

@@ -48,9 +47,9 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch

 ## Supported Architectures

-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/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

-Simply pulling `lscr.io/linuxserver/nextcloud:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/nextcloud:develop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

 The architectures supported by this image are:

@@ -58,27 +57,28 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |
+
+## Version Tags
+
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
+
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable Nextcloud releases |
+| develop | ✅ | Beta Nextcloud pre-releases *only* |

 ## Application Setup

 Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud](https://nextcloud.com/).

-Docker image update and recreation of container alone won't update nextcloud version. 
+### Updating Nextcloud

-In order to update nextcloud version, you have two options, firstly make sure you are using the latest docker image,then either 
+Updating Nextcloud is done by pulling the new image, and recreating the container with it.

-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))
+It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.

-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:
-```
-/config/nginx/site-confs/default.conf
-```
-Then restart the container to replace it with the latest one. 
+Since all data is stored in the `/config` and `/data` volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process.

 ### Collaborative Editing

@@ -86,6 +86,17 @@ Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffi

 If (auto) installed, those built-in packages may cause instability and should be removed.

+### Custom App Directories
+
+If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
+
+```yaml
+    volumes:
+      - /path/to/your_custom_apps_folder:/app/www/public/your_custom_apps_folder
+```
+
+Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).
+
 ### Strict reverse proxies

 This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
@@ -93,23 +104,25 @@ If you are using a reverse proxy which validates certificates, you need to [disa

 ## Usage

-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.
+
+>[!NOTE]
+>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.

 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))

 ```yaml
 ---
-version: "2.1"
 services:
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: lscr.io/linuxserver/nextcloud:develop
    container_name: nextcloud
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Etc/UTC
    volumes:
-      - /path/to/appdata:/config
+      - /path/to/nextcloud/config:/config
      - /path/to/data:/data
    ports:
      - 443:443
@@ -125,24 +138,23 @@ docker run -d \
  -e PGID=1000 \
  -e TZ=Etc/UTC \
  -p 443:443 \
-  -v /path/to/appdata:/config \
+  -v /path/to/nextcloud/config:/config \
  -v /path/to/data:/data \
  --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud:latest
-
+  lscr.io/linuxserver/nextcloud:develop
 ```

 ## Parameters

-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.

 | Parameter | Function |
 | :----: | --- |
-| `-p 443` | WebUI |
+| `-p 443:443` | WebUI |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Nextcloud configs. |
+| `-v /config` | Persistent config files |
 | `-v /data` | Your personal data. |

 ## Environment variables from files (Docker secrets)
@@ -152,10 +164,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:

 ```bash
-e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```

-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.

 ## Umask for running applications

@@ -164,15 +176,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu

 ## 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`.
+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`.

 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.

-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:

 ```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```

 ## Docker Mods
@@ -183,53 +200,101 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to

 ## Support Info

-* 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
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud`
-* image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:latest`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it nextcloud /bin/bash
+    ```
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f nextcloud
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:develop
+    ```

 ## 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.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), 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 Compose

-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull nextcloud`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d nextcloud`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull nextcloud
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d nextcloud
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/nextcloud:latest`
-* Stop the running container: `docker stop nextcloud`
-* Delete the container: `docker rm nextcloud`
+* Update the image:
+
+    ```bash
+    docker pull lscr.io/linuxserver/nextcloud:develop
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop nextcloud
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm nextcloud
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:

-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once nextcloud
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+    ```bash
+    docker image prune
+    ```

 ### Image Update Notifications - Diun (Docker Image Update Notifier)

-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+>[!TIP]
+>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.

 ## Building locally

@@ -241,19 +306,30 @@ cd docker-nextcloud
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/nextcloud:latest .
+  -t lscr.io/linuxserver/nextcloud:develop .
 ```

-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```

 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

 ## Versions

+* **09.01.25:** - Fix uploading large files. Existing users should update their nginx confs.
+* **24.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
+* **06.03.24:** - Rebase to Alpine 3.19 with php 8.3.
+* **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
+* **22.12.23:** - Site default conf updating to include mime.types for js and mjs and update location to include more file types.
+* **28.10.23:** - Disable web upgrades using occ during init.
+* **31.08.23:** - Re-add updatenotification app. This allows users to be notified for app updates, but also notifies for NextCloud updates. Updating NextCloud via the web UI is not supported when using this image.
+* **14.08.23:** - Add develop branch.
+* **25.06.23:** - Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-25-nextcloud/).
+* **21.06.23:** - Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings.
+* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **21.03.23:** - Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``.
 * **02.03.23:** - Set permissions on crontabs during init.
@@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-nextcloud
 external_type: na
-custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
-release_type: stable
-release_tag: latest
-ls_branch: master
+custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
  - LS_USER = 'linuxserver'
@@ -22,6 +22,6 @@ repo_vars:
  - CI_PORT='443'
  - CI_SSL='true'
  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
  - CI_WEBPATH=''
@@ -1,235 +1,429 @@
-NAME                    VERSION                TYPE   
-alpine-baselayout       3.4.0-r0               apk     
-alpine-baselayout-data  3.4.0-r0               apk     
-alpine-keys             2.4-r1                 apk     
-alpine-release          3.17.3-r0              apk     
-alsa-lib                1.2.8-r0               apk     
-aom-libs                3.5.0-r0               apk     
-apache2-utils           2.4.57-r0              apk     
-apk-tools               2.12.10-r1             apk     
-apr                     1.7.2-r0               apk     
-apr-util                1.6.3-r0               apk     
-argon2-libs             20190702-r2            apk     
-avahi-libs              0.8-r6                 apk     
-bash                    5.2.15-r0              apk     
-brotli-libs             1.0.9-r9               apk     
-busybox                 1.35.0                 binary  
-busybox                 1.35.0-r29             apk     
-busybox-binsh           1.35.0-r29             apk     
-c-client                2007f-r14              apk     
-ca-certificates         20230506-r0            apk     
-ca-certificates-bundle  20230506-r0            apk     
-cairo                   1.17.6-r3              apk     
-cairo-gobject           1.17.6-r3              apk     
-cjson                   1.7.15-r3              apk     
-coreutils               9.1-r0                 apk     
-cups-libs               2.4.2-r1               apk     
-curl                    8.1.0-r1               apk     
-dbus-libs               1.14.4-r0              apk     
-ffmpeg                  5.1.3-r0               apk     
-ffmpeg-libs             5.1.3-r0               apk     
-flac-libs               1.4.2-r0               apk     
-fontconfig              2.14.1-r0              apk     
-freetype                2.12.1-r0              apk     
-fribidi                 1.0.12-r0              apk     
-gdbm                    1.23-r0                apk     
-gdk-pixbuf              2.42.10-r0             apk     
-ghostscript             10.01.1-r0             apk     
-git                     2.38.5-r0              apk     
-glib                    2.74.7-r0              apk     
-gmp                     6.2.1-r2               apk     
-gnu-libiconv            1.17-r0                apk     
-gnu-libiconv-libs       1.17-r0                apk     
-gnutls                  3.7.8-r3               apk     
-graphite2               1.3.14-r2              apk     
-harfbuzz                5.3.1-r1               apk     
-hwdata-pci              0.364-r0               apk     
-icu-data-en             72.1-r1                apk     
-icu-libs                72.1-r1                apk     
-imagemagick             7.1.0.62-r0            apk     
-imagemagick-libs        7.1.0.62-r0            apk     
-jansson                 2.14-r0                apk     
-jbig2dec                0.19-r1                apk     
-jq                      1.6-r2                 apk     
-lame                    3.100-r2               apk     
-lcms2                   2.14-r0                apk     
-ldb                     2.5.3-r0               apk     
-libacl                  2.3.1-r1               apk     
-libarchive              3.6.1-r2               apk     
-libass                  0.16.0-r1              apk     
-libasyncns              0.8-r1                 apk     
-libattr                 2.5.1-r2               apk     
-libavif                 0.11.1-r0              apk     
-libblkid                2.38.1-r1              apk     
-libbsd                  0.11.7-r0              apk     
-libbz2                  1.0.8-r4               apk     
-libc-utils              0.7.2-r3               apk     
-libcap2                 2.66-r1                apk     
-libcrypto3              3.0.8-r4               apk     
-libcurl                 8.1.1-r1               apk     
-libdav1d                1.0.0-r2               apk     
-libde265                1.0.11-r1              apk     
-libdrm                  2.4.114-r0             apk     
-libedit                 20221030.3.1-r0        apk     
-libexpat                2.5.0-r0               apk     
-libffi                  3.4.4-r0               apk     
-libgcc                  12.2.1_git20220924-r4  apk     
-libgomp                 12.2.1_git20220924-r4  apk     
-libheif                 1.13.0-r0              apk     
-libice                  1.0.10-r1              apk     
-libintl                 0.21.1-r1              apk     
-libjpeg-turbo           2.1.4-r0               apk     
-libjxl                  0.7.0-r0               apk     
-libldap                 2.6.3-r6               apk     
-libltdl                 2.4.7-r1               apk     
-libmcrypt               2.5.8-r10              apk     
-libmd                   1.0.4-r0               apk     
-libmemcached-libs       1.0.18-r5              apk     
-libmount                2.38.1-r1              apk     
-libogg                  1.3.5-r2               apk     
-libpciaccess            0.17-r0                apk     
-libpng                  1.6.38-r0              apk     
-libpq                   15.3-r0                apk     
-libproc                 3.3.17-r2              apk     
-libpulse                16.1-r6                apk     
-librist                 0.2.7-r0               apk     
-librsvg                 2.55.1-r0              apk     
-libsasl                 2.1.28-r3              apk     
-libsm                   1.2.3-r1               apk     
-libsmbclient            4.16.10-r0             apk     
-libsndfile              1.1.0-r2               apk     
-libsodium               1.0.18-r2              apk     
-libsrt                  1.5.1-r0               apk     
-libssh                  0.10.5-r0              apk     
-libssl3                 3.0.8-r4               apk     
-libstdc++               12.2.1_git20220924-r4  apk     
-libtasn1                4.19.0-r0              apk     
-libtheora               1.1.1-r16              apk     
-libunistring            1.1-r0                 apk     
-libuuid                 2.38.1-r1              apk     
-libva                   2.16.0-r0              apk     
-libvdpau                1.5-r0                 apk     
-libvorbis               1.3.7-r0               apk     
-libvpx                  1.12.0-r1              apk     
-libwbclient             4.16.10-r0             apk     
-libwebp                 1.2.4-r2               apk     
-libx11                  1.8.4-r0               apk     
-libxau                  1.0.10-r0              apk     
-libxcb                  1.15-r0                apk     
-libxdmcp                1.1.4-r0               apk     
-libxext                 1.3.5-r0               apk     
-libxfixes               6.0.0-r0               apk     
-libxft                  2.3.7-r0               apk     
-libxml2                 2.10.4-r0              apk     
-libxpm                  3.5.15-r0              apk     
-libxrender              0.9.11-r0              apk     
-libxt                   1.2.1-r0               apk     
-libzip                  1.9.2-r2               apk     
-libzmq                  4.3.4-r1               apk     
-linux-pam               1.5.2-r1               apk     
-lmdb                    0.9.29-r2              apk     
-logrotate               3.20.1-r3              apk     
-lz4-libs                1.9.4-r1               apk     
-mbedtls                 2.28.3-r0              apk     
-musl                    1.2.3-r5               apk     
-musl-utils              1.2.3-r5               apk     
-nano                    7.0-r0                 apk     
-ncurses-libs            6.3_p20221119-r1       apk     
-ncurses-terminfo-base   6.3_p20221119-r1       apk     
-netcat-openbsd          1.130-r4               apk     
-nettle                  3.8.1-r0               apk     
-nghttp2-libs            1.51.0-r0              apk     
-nginx                   1.22.1-r0              apk     
-numactl                 2.0.16-r1              apk     
-oniguruma               6.9.8-r0               apk     
-openssl                 3.0.8-r4               apk     
-opus                    1.3.1-r1               apk     
-orc                     0.4.33-r0              apk     
-p11-kit                 0.24.1-r1              apk     
-pango                   1.50.13-r0             apk     
-pcre                    8.45-r2                apk     
-pcre2                   10.42-r0               apk     
-php-cli                 8.1.19                 binary  
-php-fpm                 8.1.19                 binary  
-php81                   8.1.19-r0              apk     
-php81-bcmath            8.1.19-r0              apk     
-php81-bz2               8.1.19-r0              apk     
-php81-common            8.1.19-r0              apk     
-php81-ctype             8.1.19-r0              apk     
-php81-curl              8.1.19-r0              apk     
-php81-dom               8.1.19-r0              apk     
-php81-exif              8.1.19-r0              apk     
-php81-fileinfo          8.1.19-r0              apk     
-php81-fpm               8.1.19-r0              apk     
-php81-ftp               8.1.19-r0              apk     
-php81-gd                8.1.19-r0              apk     
-php81-gmp               8.1.19-r0              apk     
-php81-iconv             8.1.19-r0              apk     
-php81-imap              8.1.19-r0              apk     
-php81-intl              8.1.19-r0              apk     
-php81-ldap              8.1.19-r0              apk     
-php81-mbstring          8.1.19-r0              apk     
-php81-mysqlnd           8.1.19-r0              apk     
-php81-opcache           8.1.19-r0              apk     
-php81-openssl           8.1.19-r0              apk     
-php81-pcntl             8.1.19-r0              apk     
-php81-pdo               8.1.19-r0              apk     
-php81-pdo_mysql         8.1.19-r0              apk     
-php81-pdo_pgsql         8.1.19-r0              apk     
-php81-pdo_sqlite        8.1.19-r0              apk     
-php81-pecl-apcu         5.1.22-r0              apk     
-php81-pecl-igbinary     3.2.12-r0              apk     
-php81-pecl-imagick      3.7.0-r0               apk     
-php81-pecl-mcrypt       1.0.6-r0               apk     
-php81-pecl-memcached    3.2.0-r0               apk     
-php81-pecl-redis        5.3.7-r0               apk     
-php81-pecl-smbclient    1.1.1-r0               apk     
-php81-pgsql             8.1.19-r0              apk     
-php81-phar              8.1.19-r0              apk     
-php81-posix             8.1.19-r0              apk     
-php81-session           8.1.19-r0              apk     
-php81-simplexml         8.1.19-r0              apk     
-php81-sodium            8.1.19-r0              apk     
-php81-sqlite3           8.1.19-r0              apk     
-php81-sysvsem           8.1.19-r0              apk     
-php81-xml               8.1.19-r0              apk     
-php81-xmlreader         8.1.19-r0              apk     
-php81-xmlwriter         8.1.19-r0              apk     
-php81-zip               8.1.19-r0              apk     
-pixman                  0.42.2-r0              apk     
-pkgconf                 1.9.4-r0               apk     
-popt                    1.19-r0                apk     
-procps                  3.3.17-r2              apk     
-readline                8.2.0-r0               apk     
-samba-client            4.16.10-r0             apk     
-samba-client-libs       4.16.10-r0             apk     
-samba-common            4.16.10-r0             apk     
-samba-libs              4.16.10-r0             apk     
-samba-util-libs         4.16.10-r0             apk     
-scanelf                 1.3.5-r1               apk     
-sdl2                    2.26.5-r0              apk     
-shadow                  4.13-r0                apk     
-shared-mime-info        2.2-r2                 apk     
-skalibs                 2.12.0.1-r0            apk     
-soxr                    0.1.3-r3               apk     
-speexdsp                1.2.1-r0               apk     
-sqlite-libs             3.40.1-r0              apk     
-ssl_client              1.35.0-r29             apk     
-sudo                    1.9.12_p2-r1           apk     
-svt-av1-libs            1.3.0-r0               apk     
-talloc                  2.3.4-r0               apk     
-tdb-libs                1.4.6-r0               apk     
-tevent                  0.13.0-r0              apk     
-tiff                    4.4.0-r3               apk     
-tzdata                  2023c-r0               apk     
-utmps-libs              0.1.2.0-r1             apk     
-v4l-utils-libs          1.22.1-r2              apk     
-vidstab                 1.1.0-r2               apk     
-wayland-libs-client     1.21.0-r1              apk     
-x264-libs               0.164_git20220602-r0   apk     
-x265-libs               3.5-r3                 apk     
-xvidcore                1.3.7-r1               apk     
-xz                      5.2.9-r0               apk     
-xz-libs                 5.2.9-r0               apk     
-zlib                    1.2.13-r0              apk     
-zstd-libs               1.5.5-r0               apk     
+NAME                                   VERSION                TYPE                          
+Hidden Input                           1, 0, 0, 0             dotnet                         
+Process Wrapper                        1.0.0.0                dotnet        (+1 duplicate)   
+activity                               4.0.0                  npm                            
+alpine-baselayout                      3.6.5-r0               apk                            
+alpine-baselayout-data                 3.6.5-r0               apk                            
+alpine-keys                            2.4-r1                 apk                            
+alpine-release                         3.20.5-r0              apk                            
+alsa-lib                               1.2.11-r0              apk                            
+amphp/amp                              v2.6.4                 php-composer  (+1 duplicate)   
+amphp/byte-stream                      v1.8.2                 php-composer  (+1 duplicate)   
+amphp/parallel                         v1.4.3                 php-composer                   
+amphp/parser                           v1.1.1                 php-composer                   
+amphp/process                          v1.1.9                 php-composer                   
+amphp/serialization                    v1.0.0                 php-composer                   
+amphp/sync                             v1.4.2                 php-composer                   
+andrewdalpino/okbloomer                1.0.0                  php-composer                   
+aom-libs                               3.9.1-r0               apk                            
+apache2-utils                          2.4.62-r0              apk                            
+apk-tools                              2.14.4-r1              apk                            
+app_api                                1.0.0                  npm                            
+apr                                    1.7.5-r0               apk                            
+apr-util                               1.6.3-r1               apk                            
+argon2-libs                            20190702-r5            apk                            
+aws/aws-crt-php                        v1.2.7                 php-composer                   
+aws/aws-sdk-php                        3.324.13               php-composer                   
+bamarni/composer-bin-plugin            1.8.2                  php-composer  (+1 duplicate)   
+bantu/ini-get-wrapper                  v1.0.1                 php-composer                   
+bash                                   5.2.26-r0              apk                            
+brick/math                             0.12.1                 php-composer                   
+brotli-libs                            1.1.0-r2               apk                            
+bruteforcesettings                     4.0.0                  npm                            
+busybox                                1.36.1-r29             apk                            
+busybox-binsh                          1.36.1-r29             apk                            
+c-ares                                 1.33.1-r0              apk                            
+c-client                               2007f-r15              apk                            
+ca-certificates                        20241121-r1            apk                            
+ca-certificates-bundle                 20241121-r1            apk                            
+catatonit                              0.2.0-r0               apk                            
+christian-riesen/base32                1.6.0                  php-composer                   
+cjson                                  1.7.18-r0              apk                            
+composer                               2.8.5                  binary                         
+composer/pcre                          3.3.1                  php-composer                   
+composer/semver                        3.4.2                  php-composer                   
+composer/xdebug-handler                3.0.5                  php-composer                   
+coreutils                              9.5-r2                 apk                            
+coreutils-env                          9.5-r2                 apk                            
+coreutils-fmt                          9.5-r2                 apk                            
+coreutils-sha512sum                    9.5-r2                 apk                            
+curl                                   8.11.1-r0              apk                            
+cweagans/composer-patches              1.7.3                  php-composer                   
+dbus-libs                              1.14.10-r1             apk                            
+deepdiver/zipstreamer                  v2.0.3                 php-composer                   
+deepdiver1975/tarstreamer              v2.1.0                 php-composer                   
+dnoegel/php-xdg-base-dir               v0.1.1                 php-composer                   
+doctrine/cache                         2.2.0                  php-composer                   
+doctrine/dbal                          3.9.4                  php-composer                   
+doctrine/deprecations                  1.1.3                  php-composer                   
+doctrine/deprecations                  1.1.4                  php-composer                   
+doctrine/event-manager                 2.0.1                  php-composer                   
+doctrine/lexer                         3.0.1                  php-composer                   
+egulias/email-validator                4.0.3                  php-composer                   
+felixfbecker/advanced-json-rpc         v3.2.1                 php-composer                   
+felixfbecker/language-server-protocol  v1.5.2                 php-composer                   
+ffmpeg                                 6.1.1-r8               apk                            
+ffmpeg-libavcodec                      6.1.1-r8               apk                            
+ffmpeg-libavdevice                     6.1.1-r8               apk                            
+ffmpeg-libavfilter                     6.1.1-r8               apk                            
+ffmpeg-libavformat                     6.1.1-r8               apk                            
+ffmpeg-libavutil                       6.1.1-r8               apk                            
+ffmpeg-libpostproc                     6.1.1-r8               apk                            
+ffmpeg-libswresample                   6.1.1-r8               apk                            
+ffmpeg-libswscale                      6.1.1-r8               apk                            
+fftw-double-libs                       3.3.10-r5              apk                            
+fidry/cpu-core-counter                 1.2.0                  php-composer                   
+files_downloadlimit                    4.0.0                  npm                            
+files_pdfviewer                        4.0.0                  npm                            
+findutils                              4.9.0-r5               apk                            
+firstrunwizard                         4.0.0                  npm                            
+fontconfig                             2.15.0-r1              apk                            
+freetype                               2.13.2-r0              apk                            
+fribidi                                1.0.15-r0              apk                            
+fusonic/opengraph                      v2.3.0                 php-composer                   
+gdbm                                   1.23-r1                apk                            
+giflib                                 5.2.2-r0               apk                            
+giggsey/libphonenumber-for-php-lite    8.13.48                php-composer                   
+git                                    2.45.3-r0              apk                            
+git-init-template                      2.45.3-r0              apk                            
+glib                                   2.80.5-r0              apk                            
+glslang-libs                           1.3.261.1-r0           apk                            
+gmp                                    6.3.0-r1               apk                            
+gnu-libiconv                           1.17-r2                apk                            
+gnu-libiconv-libs                      1.17-r2                apk                            
+gnutls                                 3.8.5-r0               apk                            
+graphite2                              1.3.14-r6              apk                            
+guzzlehttp/guzzle                      7.9.2                  php-composer                   
+guzzlehttp/promises                    2.0.4                  php-composer                   
+guzzlehttp/psr7                        2.7.0                  php-composer                   
+guzzlehttp/uri-template                v1.0.3                 php-composer                   
+harfbuzz                               8.5.0-r0               apk                            
+hexogen/kdtree                         v0.2.6                 php-composer                   
+hwdata-pci                             0.382-r0               apk                            
+icewind/searchdav                      v3.1.0                 php-composer                   
+icewind/smb                            v3.7.0                 php-composer                   
+icewind/streams                        v0.7.7                 php-composer  (+1 duplicate)   
+icu-data-en                            74.2-r0                apk                            
+icu-libs                               74.2-r0                apk                            
+imagemagick                            7.1.1.32-r2            apk                            
+imagemagick-jpeg                       7.1.1.32-r2            apk                            
+imagemagick-jxl                        7.1.1.32-r2            apk                            
+imagemagick-libs                       7.1.1.32-r2            apk                            
+imagemagick-webp                       7.1.1.32-r2            apk                            
+imath                                  3.1.12-r0              apk                            
+jansson                                2.14-r4                apk                            
+jq                                     1.7.1-r0               apk                            
+justinrainbow/json-schema              5.3.0                  php-composer                   
+kornrunner/blurhash                    v1.2.2                 php-composer                   
+lame-libs                              3.100-r5               apk                            
+laravel/serializable-closure           v1.3.5                 php-composer                   
+lcms2                                  2.16-r0                apk                            
+lcobucci/clock                         3.0.0                  php-composer                   
+ldb                                    2.8.2-r0               apk                            
+libSvtAv1Enc                           2.0.0-r1               apk                            
+libacl                                 2.3.2-r0               apk                            
+libarchive                             3.7.7-r0               apk                            
+libass                                 0.17.2-r0              apk                            
+libasyncns                             0.8-r3                 apk                            
+libattr                                2.5.2-r0               apk                            
+libauth-samba                          4.19.9-r0              apk                            
+libavif                                1.0.4-r0               apk                            
+libblkid                               2.40.1-r1              apk                            
+libbluray                              1.3.4-r1               apk                            
+libbsd                                 0.12.2-r0              apk                            
+libbz2                                 1.0.8-r6               apk                            
+libcap2                                2.70-r0                apk                            
+libcrypto3                             3.3.2-r1               apk                            
+libcurl                                8.11.1-r0              apk                            
+libdav1d                               1.4.2-r0               apk                            
+libdovi                                3.3.0-r0               apk                            
+libdrm                                 2.4.120-r0             apk                            
+libeconf                               0.6.3-r0               apk                            
+libedit                                20240517.3.1-r0        apk                            
+libevent                               2.1.12-r7              apk                            
+libexpat                               2.6.4-r0               apk                            
+libffi                                 3.4.6-r0               apk                            
+libflac                                1.4.3-r1               apk                            
+libformw                               6.4_p20240420-r2       apk                            
+libgcc                                 13.2.1_git20240309-r0  apk                            
+libgomp                                13.2.1_git20240309-r0  apk                            
+libhwy                                 1.0.7-r0               apk                            
+libice                                 1.1.1-r6               apk                            
+libidn2                                2.3.7-r0               apk                            
+libintl                                0.22.5-r0              apk                            
+libjpeg-turbo                          3.0.3-r0               apk                            
+libjxl                                 0.10.2-r0              apk                            
+libldap                                2.6.8-r0               apk                            
+libltdl                                2.4.7-r3               apk                            
+libmcrypt                              2.5.8-r10              apk                            
+libmd                                  1.1.0-r0               apk                            
+libmemcached-libs                      1.1.4-r1               apk                            
+libmount                               2.40.1-r1              apk                            
+libncursesw                            6.4_p20240420-r2       apk                            
+libogg                                 1.3.5-r5               apk                            
+libopenmpt                             0.7.7-r0               apk                            
+libpanelw                              6.4_p20240420-r2       apk                            
+libpciaccess                           0.18.1-r0              apk                            
+libplacebo                             6.338.2-r1             apk                            
+libpng                                 1.6.44-r0              apk                            
+libpq                                  16.6-r0                apk                            
+libproc2                               4.0.4-r0               apk                            
+libpsl                                 0.21.5-r1              apk                            
+libpulse                               17.0-r0                apk                            
+librist                                0.2.10-r1              apk                            
+libsasl                                2.1.28-r6              apk                            
+libsharpyuv                            1.3.2-r0               apk                            
+libsm                                  1.2.4-r4               apk                            
+libsmbclient                           4.19.9-r0              apk                            
+libsndfile                             1.2.2-r1               apk                            
+libsodium                              1.0.19-r0              apk                            
+libsrt                                 1.5.3-r0               apk                            
+libssh                                 0.10.6-r0              apk                            
+libssl3                                3.3.2-r1               apk                            
+libstdc++                              13.2.1_git20240309-r0  apk                            
+libtasn1                               4.20.0-r0              apk                            
+libtheora                              1.1.1-r18              apk                            
+libunibreak                            6.1-r0                 apk                            
+libunistring                           1.2-r0                 apk                            
+libuuid                                2.40.1-r1              apk                            
+libva                                  2.21.0-r0              apk                            
+libvdpau                               1.5-r3                 apk                            
+libvorbis                              1.3.7-r2               apk                            
+libvpx                                 1.14.1-r0              apk                            
+libwbclient                            4.19.9-r0              apk                            
+libwebp                                1.3.2-r0               apk                            
+libwebpdemux                           1.3.2-r0               apk                            
+libwebpmux                             1.3.2-r0               apk                            
+libx11                                 1.8.9-r1               apk                            
+libxau                                 1.0.11-r4              apk                            
+libxcb                                 1.16.1-r0              apk                            
+libxdmcp                               1.1.5-r1               apk                            
+libxext                                1.3.6-r2               apk                            
+libxfixes                              6.0.1-r4               apk                            
+libxml2                                2.12.7-r0              apk                            
+libxpm                                 3.5.17-r0              apk                            
+libxt                                  1.3.0-r5               apk                            
+libxxhash                              0.8.2-r2               apk                            
+libzip                                 1.10.1-r0              apk                            
+libzmq                                 4.3.5-r2               apk                            
+lilv-libs                              0.24.24-r1             apk                            
+linux-pam                              1.6.0-r0               apk                            
+lmdb                                   0.9.32-r0              apk                            
+logreader                              4.0.0                  npm                            
+logrotate                              3.21.0-r1              apk                            
+lz4-libs                               1.9.4-r5               apk                            
+masterminds/html5                      2.9.0                  php-composer                   
+mbedtls                                3.6.2-r0               apk                            
+mexitek/phpcolors                      v1.0.4                 php-composer                   
+microsoft/azure-storage-blob           1.5.4                  php-composer                   
+microsoft/azure-storage-common         1.5.2                  php-composer                   
+mlocati/ip-lib                         1.18.1                 php-composer                   
+mpg123-libs                            1.32.8-r0              apk                            
+mtdowling/jmespath.php                 2.8.0                  php-composer                   
+musl                                   1.2.5-r0               apk                            
+musl-utils                             1.2.5-r0               apk                            
+nano                                   8.0-r0                 apk                            
+ncurses-terminfo-base                  6.4_p20240420-r2       apk                            
+netcat-openbsd                         1.226-r0               apk                            
+netresearch/jsonmapper                 v4.5.0                 php-composer                   
+nettle                                 3.9.1-r0               apk                            
+nextcloud                              1.0.0                  npm                            
+nextcloud/coding-standard              v1.2.1                 php-composer                   
+nextcloud/lognormalizer                v1.0.0                 php-composer                   
+nextcloud/ocp                          dev-master             php-composer                   
+nghttp2-libs                           1.62.1-r0              apk                            
+nginx                                  1.26.2-r0              apk                            
+nikic/php-parser                       v4.19.2                php-composer                   
+notifications                          4.0.0                  npm                            
+numactl                                2.0.18-r0              apk                            
+onevpl-libs                            2023.3.1-r2            apk                            
+oniguruma                              6.9.9-r0               apk                            
+openexr-libiex                         3.1.13-r1              apk                            
+openexr-libilmthread                   3.1.13-r1              apk                            
+openexr-libopenexr                     3.1.13-r1              apk                            
+openssl                                3.3.2-r1               apk                            
+opus                                   1.5.2-r0               apk                            
+orc                                    0.4.40-r0              apk                            
+p11-kit                                0.25.3-r0              apk                            
+paragonie/constant_time_encoding       v2.6.3                 php-composer                   
+password_policy                        3.0.0                  npm                            
+pcre                                   8.45-r3                apk                            
+pcre2                                  10.43-r0               apk                            
+pear/archive_tar                       1.5.0                  php-composer                   
+pear/console_getopt                    v1.4.3                 php-composer                   
+pear/pear-core-minimal                 v1.10.15               php-composer                   
+pear/pear_exception                    v1.0.2                 php-composer                   
+photos                                 4.0.0                  npm                            
+php-cs-fixer/shim                      v3.62.0                php-composer                   
+php-http/guzzle7-adapter               1.0.0                  php-composer                   
+php-http/httplug                       2.2.0                  php-composer                   
+php-http/promise                       1.1.0                  php-composer                   
+php-opencloud/openstack                v3.10.0                php-composer                   
+php83                                  8.3.15-r0              apk                            
+php83-bcmath                           8.3.15-r0              apk                            
+php83-bz2                              8.3.15-r0              apk                            
+php83-common                           8.3.15-r0              apk                            
+php83-ctype                            8.3.15-r0              apk                            
+php83-curl                             8.3.15-r0              apk                            
+php83-dom                              8.3.15-r0              apk                            
+php83-exif                             8.3.15-r0              apk                            
+php83-fileinfo                         8.3.15-r0              apk                            
+php83-fpm                              8.3.15-r0              apk                            
+php83-ftp                              8.3.15-r0              apk                            
+php83-gd                               8.3.15-r0              apk                            
+php83-gmp                              8.3.15-r0              apk                            
+php83-iconv                            8.3.15-r0              apk                            
+php83-imap                             8.3.15-r0              apk                            
+php83-intl                             8.3.15-r0              apk                            
+php83-ldap                             8.3.15-r0              apk                            
+php83-mbstring                         8.3.15-r0              apk                            
+php83-mysqlnd                          8.3.15-r0              apk                            
+php83-opcache                          8.3.15-r0              apk                            
+php83-openssl                          8.3.15-r0              apk                            
+php83-pcntl                            8.3.15-r0              apk                            
+php83-pdo                              8.3.15-r0              apk                            
+php83-pdo_mysql                        8.3.15-r0              apk                            
+php83-pdo_pgsql                        8.3.15-r0              apk                            
+php83-pdo_sqlite                       8.3.15-r0              apk                            
+php83-pecl-apcu                        5.1.23-r0              apk                            
+php83-pecl-igbinary                    3.2.15-r0              apk                            
+php83-pecl-imagick                     3.7.0-r0               apk                            
+php83-pecl-mcrypt                      1.0.7-r0               apk                            
+php83-pecl-memcached                   3.3.0-r0               apk                            
+php83-pecl-msgpack                     2.2.0-r2               apk                            
+php83-pecl-redis                       6.1.0-r0               apk                            
+php83-pecl-smbclient                   1.1.1-r0               apk                            
+php83-pgsql                            8.3.15-r0              apk                            
+php83-phar                             8.3.15-r0              apk                            
+php83-posix                            8.3.15-r0              apk                            
+php83-session                          8.3.15-r0              apk                            
+php83-simplexml                        8.3.15-r0              apk                            
+php83-sockets                          8.3.15-r0              apk                            
+php83-sodium                           8.3.15-r0              apk                            
+php83-sqlite3                          8.3.15-r0              apk                            
+php83-sysvsem                          8.3.15-r0              apk                            
+php83-xml                              8.3.15-r0              apk                            
+php83-xmlreader                        8.3.15-r0              apk                            
+php83-xmlwriter                        8.3.15-r0              apk                            
+php83-zip                              8.3.15-r0              apk                            
+phpdocumentor/reflection-common        2.2.0                  php-composer                   
+phpdocumentor/reflection-docblock      5.4.1                  php-composer                   
+phpdocumentor/type-resolver            1.8.2                  php-composer                   
+phpseclib/phpseclib                    2.0.47                 php-composer                   
+phpstan/phpdoc-parser                  1.30.1                 php-composer                   
+pimple/pimple                          v3.5.0                 php-composer                   
+popt                                   1.19-r3                apk                            
+privacy                                3.0.0                  npm                            
+procps-ng                              4.0.4-r0               apk                            
+psr/cache                              3.0.0                  php-composer                   
+psr/clock                              1.0.0                  php-composer  (+1 duplicate)   
+psr/container                          2.0.2                  php-composer  (+1 duplicate)   
+psr/event-dispatcher                   1.0.0                  php-composer  (+1 duplicate)   
+psr/http-client                        1.0.3                  php-composer                   
+psr/http-factory                       1.1.0                  php-composer                   
+psr/http-message                       1.1                    php-composer                   
+psr/log                                1.1.4                  php-composer                   
+psr/log                                3.0.2                  php-composer  (+1 duplicate)   
+punic/punic                            3.8.1                  php-composer                   
+ralouphie/getallheaders                3.0.3                  php-composer                   
+rav1e-libs                             0.7.1-r0               apk                            
+readline                               8.2.10-r0              apk                            
+recommendations                        4.0.0                  npm                            
+related_resources                      2.0.0                  npm                            
+rsync                                  3.4.0-r0               apk                            
+rubix/ml                               2.3.2                  php-composer                   
+rubix/tensor                           3.0.5                  php-composer                   
+rullzer/easytotp                       v0.1.4                 php-composer                   
+sabre/dav                              4.7.0                  php-composer                   
+sabre/event                            5.1.7                  php-composer                   
+sabre/http                             5.1.12                 php-composer                   
+sabre/uri                              2.3.4                  php-composer                   
+sabre/vobject                          4.5.6                  php-composer                   
+sabre/xml                              2.2.11                 php-composer                   
+samba-client                           4.19.9-r0              apk                            
+samba-client-libs                      4.19.9-r0              apk                            
+samba-common                           4.19.9-r0              apk                            
+samba-libs                             4.19.9-r0              apk                            
+samba-util-libs                        4.19.9-r0              apk                            
+scanelf                                1.3.7-r2               apk                            
+scssphp/scssphp                        v1.12.1                php-composer                   
+sdl2                                   2.28.5-r1              apk                            
+sebastian/diff                         5.1.1                  php-composer                   
+serd-libs                              0.32.2-r0              apk                            
+shaderc                                2024.0-r0              apk                            
+shadow                                 4.15.1-r0              apk                            
+skalibs                                2.14.1.1-r0            apk                            
+sord-libs                              0.16.16-r0             apk                            
+soxr                                   0.1.3-r7               apk                            
+spatie/array-to-xml                    3.3.0                  php-composer                   
+speexdsp                               1.2.1-r2               apk                            
+spirv-tools                            1.3.261.1-r0           apk                            
+spomky-labs/cbor-php                   3.0.4                  php-composer                   
+spomky-labs/pki-framework              1.2.1                  php-composer                   
+sqlite-libs                            3.45.3-r1              apk                            
+sratom                                 0.6.16-r0              apk                            
+ssl_client                             1.36.1-r29             apk                            
+stecman/symfony-console-completion     v0.13.0                php-composer                   
+sudo                                   1.9.15_p5-r0           apk                            
+support                                3.0.0                  npm                            
+symfony/console                        v6.4.11                php-composer                   
+symfony/console                        v6.4.17                php-composer                   
+symfony/css-selector                   v6.4.3                 php-composer                   
+symfony/deprecation-contracts          v3.5.0                 php-composer                   
+symfony/deprecation-contracts          v3.5.1                 php-composer                   
+symfony/dom-crawler                    v6.4.4                 php-composer                   
+symfony/event-dispatcher               v6.4.13                php-composer                   
+symfony/event-dispatcher-contracts     v3.5.1                 php-composer                   
+symfony/filesystem                     v6.4.9                 php-composer                   
+symfony/http-foundation                v6.4.18                php-composer                   
+symfony/mailer                         v6.4.18                php-composer                   
+symfony/mime                           v6.4.18                php-composer                   
+symfony/polyfill-ctype                 v1.31.0                php-composer  (+1 duplicate)   
+symfony/polyfill-iconv                 v1.31.0                php-composer                   
+symfony/polyfill-intl-grapheme         v1.31.0                php-composer  (+2 duplicates)  
+symfony/polyfill-intl-idn              v1.31.0                php-composer                   
+symfony/polyfill-intl-normalizer       v1.31.0                php-composer  (+2 duplicates)  
+symfony/polyfill-mbstring              v1.31.0                php-composer  (+2 duplicates)  
+symfony/polyfill-php72                 v1.31.0                php-composer                   
+symfony/polyfill-php80                 v1.31.0                php-composer  (+1 duplicate)   
+symfony/polyfill-php82                 v1.31.0                php-composer                   
+symfony/polyfill-php83                 v1.31.0                php-composer  (+1 duplicate)   
+symfony/polyfill-uuid                  v1.29.0                php-composer                   
+symfony/process                        v6.4.15                php-composer                   
+symfony/routing                        v6.4.18                php-composer                   
+symfony/service-contracts              v3.5.0                 php-composer                   
+symfony/service-contracts              v3.5.1                 php-composer                   
+symfony/string                         v6.4.11                php-composer                   
+symfony/string                         v6.4.15                php-composer                   
+symfony/translation                    v6.4.13                php-composer                   
+symfony/translation-contracts          v3.5.1                 php-composer                   
+symfony/uid                            v6.4.3                 php-composer                   
+talloc                                 2.4.2-r1               apk                            
+tdb-libs                               1.4.9-r1               apk                            
+tevent                                 0.16.1-r0              apk                            
+text                                   5.0.0                  npm                            
+twofactor_nextcloud_notification       5.0.0                  npm                            
+twofactor_totp                         13.0.0-dev.0           npm                            
+tzdata                                 2024b-r0               apk                            
+utmps-libs                             0.1.2.2-r1             apk                            
+v4l-utils-libs                         1.24.1-r1              apk                            
+vidstab                                1.1.1-r0               apk                            
+viewer                                 4.0.0                  npm                            
+vimeo/psalm                            5.26.1                 php-composer                   
+voku/portable-ascii                    2.0.3                  php-composer                   
+voku/portable-utf8                     6.0.13                 php-composer                   
+vulkan-loader                          1.3.261.1-r0           apk                            
+wamania/php-stemmer                    v3.0.1                 php-composer                   
+wapmorgan/mp3info                      0.1.0                  php-composer                   
+wayland-libs-client                    1.22.0-r4              apk                            
+web-auth/cose-lib                      4.3.0                  php-composer                   
+web-auth/webauthn-lib                  4.9.1                  php-composer                   
+webmozart/assert                       1.11.0                 php-composer                   
+x264-libs                              0.164_git20231001-r0   apk                            
+x265-libs                              3.6-r0                 apk                            
+xvidcore                               1.3.7-r2               apk                            
+xz-libs                                5.6.2-r0               apk                            
+zimg                                   3.0.5-r2               apk                            
+zix-libs                               0.4.2-r0               apk                            
+zlib                                   1.3.1-r1               apk                            
+zstd-libs                              1.5.6-r0               apk                            
@@ -9,116 +9,164 @@ project_blurb: |

  Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_blurb_optional_extras_enabled: false
-
 # supported architectures
 available_architectures:
-  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
-
+  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 # development version
-development_versions: false
+development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable Nextcloud releases" }
-
+  - {tag: "latest", desc: "Stable Nextcloud releases"}
+  - {tag: "develop", desc: "Beta Nextcloud pre-releases *only*"}
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
-param_usage_include_net: false
-param_usage_include_env: true
-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/{{ project_name }}/config", desc: "Persistent config files"}
+  - {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" }
-param_device_map: false
-cap_add_param: false
-
-# optional container parameters
-opt_param_usage_include_env: false
-opt_param_usage_include_vols: false
-opt_param_usage_include_ports: false
-opt_param_device_map: false
-opt_cap_add_param: false
-optional_block_1: false
-
+  - {external_port: "443", internal_port: "443", port_desc: "WebUI"}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
  Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).

-  Docker image update and recreation of container alone won't update nextcloud version. 
+  ### Updating Nextcloud

-  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))
+  Updating Nextcloud is done by pulling the new image, and recreating the container with it.

-  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:
-  ```
-  /config/nginx/site-confs/default.conf
-  ```
-  Then restart the container to replace it with the latest one. 
+  It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.
+
+  Since all data is stored in the `/config` and `/data` volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process.

  ### Collaborative Editing

  Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.

  If (auto) installed, those built-in packages may cause instability and should be removed.
-  

+  ### Custom App Directories
+
+  If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
+
+  ```yaml
+      volumes:
+        - /path/to/your_custom_apps_folder:/app/www/public/your_custom_apps_folder
+  ```
+
+  Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).
+# init diagram
+init_diagram: |
+  "nextcloud:develop": {
+    docker-mods
+    base {
+      fix-attr +\nlegacy cont-init
+    }
+    docker-mods -> base
+    legacy-services
+    custom services
+    init-services -> legacy-services
+    init-services -> custom services
+    custom services -> legacy-services
+    legacy-services -> ci-service-check
+    init-migrations -> init-adduser
+    init-nginx-end -> init-config
+    init-os-end -> init-config
+    init-config -> init-config-end
+    init-nextcloud-config -> init-config-end
+    init-os-end -> init-crontab-config
+    init-mods-end -> init-custom-files
+    base -> init-envfile
+    init-os-end -> init-folders
+    init-php -> init-keygen
+    base -> init-migrations
+    base -> init-mods
+    init-config-end -> init-mods
+    init-version-checks -> init-mods
+    init-mods -> init-mods-end
+    init-mods-package-install -> init-mods-end
+    init-mods -> init-mods-package-install
+    init-nginx-end -> init-nextcloud-config
+    init-samples -> init-nginx
+    init-permissions -> init-nginx-end
+    base -> init-os-end
+    init-adduser -> init-os-end
+    init-envfile -> init-os-end
+    init-migrations -> init-os-end
+    init-keygen -> init-permissions
+    init-nginx -> init-php
+    init-folders -> init-samples
+    init-custom-files -> init-services
+    init-mods-end -> init-services
+    init-config-end -> init-version-checks
+    init-services -> svc-cron
+    svc-cron -> legacy-services
+    init-services -> svc-nginx
+    svc-nginx -> legacy-services
+    init-services -> svc-php-fpm
+    svc-php-fpm -> legacy-services
+  }
+  Base Images: {
+    "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20"
+  }
+  "nextcloud:develop" <- Base Images
 # changelog
 changelogs:
-  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
-  - { date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``." }
-  - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
-  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
-  - { date: "10.10.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
-  - { date: "30.09.22:", desc: "Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html" }
-  - { date: "21.05.22:", desc: "Update version check endpoint." }
-  - { date: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16." }
-  - { date: "14.04.22:", desc: "Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection." }
-  - { date: "11.09.21:", desc: "Rebasing to alpine 3.14" }
-  - { date: "21.03.21:", desc: "Publish `php8` tag for testing." }
-  - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
-  - { date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup." }
-  - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
-  - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." }
-  - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
-  - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" }
-  - { date: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo" }
-  - { 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.conf` 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.conf` 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.conf` 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." }
-  - { date: "27.02.19:", desc: "Updating base nginx config to sync up with v15 requirements." }
-  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
-  - { date: "28.01.19:", desc: "Add pipeline logic and multi arch." }
-  - { date: "25.01.19:", desc: "Add php7-phar for occ upgrades." }
-  - { date: "05.09.18:", desc: "Rebase to alpine 3.8." }
-  - { date: "11.06.18:", desc: "Use latest rather than specific version for initial install." }
-  - { date: "26.04.18:", desc: "Bump default install to 13.0.1." }
-  - { date: "06.02.18:", desc: "Bump default install to 13.0.0." }
-  - { date: "26.01.18:", desc: "Rebase to alpine 3.7, bump default install to 12.0.5." }
-  - { date: "12.12.17:", desc: "Bump default install to 12.0.4, fix continuation lines." }
-  - { date: "15.10.17:", desc: "Sed php.ini for opcache requirements in newer nextcloud versions." }
-  - { date: "20.09.17:", desc: "Bump default install to 12.0.3." }
-  - { date: "19.08.17:", desc: "Bump default install to 12.0.2." }
-  - { date: "25.05.17:", desc: "Rebase to alpine 3.6." }
-  - { date: "22.05.17:", desc: "Update to nextcloud 12.0, adding required dependecies and note about commenting out SAMEORIGIN; line." }
-  - { date: "03.05.17:", desc: "Use community repo of memcache." }
-  - { date: "07.03.17:", desc: "Release into main repository and upgrade to php7 and Alpine 3.5." }
+  - {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."}
+  - {date: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
+  - {date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - {date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
+  - {date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types."}
+  - {date: "28.10.23:", desc: "Disable web upgrades using occ during init."}
+  - {date: "31.08.23:", desc: "Re-add updatenotification app. This allows users to be notified for app updates, but also notifies for NextCloud updates. Updating NextCloud via the web UI is not supported when using this image."}
+  - {date: "14.08.23:", desc: "Add develop branch."}
+  - {date: "25.06.23:", desc: "Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-25-nextcloud/)."}
+  - {date: "21.06.23:", desc: "Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings."}
+  - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}
+  - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
+  - {date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``."}
+  - {date: "02.03.23:", desc: "Set permissions on crontabs during init."}
+  - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
+  - {date: "10.10.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."}
+  - {date: "30.09.22:", desc: "Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html"}
+  - {date: "21.05.22:", desc: "Update version check endpoint."}
+  - {date: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16."}
+  - {date: "14.04.22:", desc: "Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection."}
+  - {date: "11.09.21:", desc: "Rebasing to alpine 3.14"}
+  - {date: "21.03.21:", desc: "Publish `php8` tag for testing."}
+  - {date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)."}
+  - {date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup."}
+  - {date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)."}
+  - {date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)."}
+  - {date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)."}
+  - {date: "03.06.20:", desc: "Rebasing to alpine 3.12"}
+  - {date: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo"}
+  - {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.conf` 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.conf` 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.conf` 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."}
+  - {date: "27.02.19:", desc: "Updating base nginx config to sync up with v15 requirements."}
+  - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
+  - {date: "28.01.19:", desc: "Add pipeline logic and multi arch."}
+  - {date: "25.01.19:", desc: "Add php7-phar for occ upgrades."}
+  - {date: "05.09.18:", desc: "Rebase to alpine 3.8."}
+  - {date: "11.06.18:", desc: "Use latest rather than specific version for initial install."}
+  - {date: "26.04.18:", desc: "Bump default install to 13.0.1."}
+  - {date: "06.02.18:", desc: "Bump default install to 13.0.0."}
+  - {date: "26.01.18:", desc: "Rebase to alpine 3.7, bump default install to 12.0.5."}
+  - {date: "12.12.17:", desc: "Bump default install to 12.0.4, fix continuation lines."}
+  - {date: "15.10.17:", desc: "Sed php.ini for opcache requirements in newer nextcloud versions."}
+  - {date: "20.09.17:", desc: "Bump default install to 12.0.3."}
+  - {date: "19.08.17:", desc: "Bump default install to 12.0.2."}
+  - {date: "25.05.17:", desc: "Rebase to alpine 3.6."}
+  - {date: "22.05.17:", desc: "Update to nextcloud 12.0, adding required dependecies and note about commenting out SAMEORIGIN; line."}
+  - {date: "03.05.17:", desc: "Use community repo of memcache."}
+  - {date: "07.03.17:", desc: "Release into main repository and upgrade to php7 and Alpine 3.5."}
@@ -0,0 +1,4 @@
+/apps/
+/config/
+/data/
+/themes/
@@ -1,6 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.local' => '\OC\Memcache\APCu',
-  'datadirectory' => '/data',
-  );
-
@@ -1,4 +1,4 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample

 # Set the `immutable` cache control options only for assets with a cache busting `v` argument
 map $arg_v $asset_immutable {
@@ -9,24 +9,23 @@ map $arg_v $asset_immutable {
 server {
    listen 80 default_server;
    listen [::]:80 default_server;
-
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;

    server_name _;

    include /config/nginx/ssl.conf;

-    root /config/www/nextcloud/;
+    root /app/www/public;

    # display real ip in nginx logs when connected through reverse proxy via docker network
-    set_real_ip_from 172.0.0.0/8;
+    set_real_ip_from 172.16.0.0/12;
    real_ip_header X-Forwarded-For;

    # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html#nextcloud-in-the-webroot-of-nginx

    # set max upload size and increase upload timeout:
-    client_max_body_size 512M;
+    client_max_body_size 0;
    client_body_timeout 300s;
    fastcgi_buffers 64 4K;

@@ -36,25 +35,24 @@ server {
    gzip_comp_level 4;
    gzip_min_length 256;
    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/wasm 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;
+    gzip_types application/atom+xml text/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm 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;

    # Pagespeed is not supported by Nextcloud, so if your server is built
    # with the `ngx_pagespeed` module, uncomment this line to disable it.
    #pagespeed off;

-    # The settings allows you to optimize the HTTP2 bandwitdth.
+    # The settings allows you to optimize the HTTP2 bandwidth.
    # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
-    # for tunning hints
+    # for tuning hints
    client_body_buffer_size 512k;

    # HTTP response headers borrowed from Nextcloud `.htaccess`
-    add_header Referrer-Policy                      "no-referrer"       always;
-    add_header X-Content-Type-Options               "nosniff"           always;
-    add_header X-Download-Options                   "noopen"            always;
-    add_header X-Frame-Options                      "SAMEORIGIN"        always;
-    add_header X-Permitted-Cross-Domain-Policies    "none"              always;
-    add_header X-Robots-Tag                         "noindex, nofollow" always;
-    add_header X-XSS-Protection                     "1; mode=block"     always;
+    add_header Referrer-Policy                   "no-referrer"       always;
+    add_header X-Content-Type-Options            "nosniff"           always;
+    add_header X-Frame-Options                   "SAMEORIGIN"        always;
+    add_header X-Permitted-Cross-Domain-Policies "none"              always;
+    add_header X-Robots-Tag                      "noindex, nofollow" always;
+    add_header X-XSS-Protection                  "1; mode=block"     always;

    # Remove X-Powered-By, which is an information leak
    fastcgi_hide_header X-Powered-By;
@@ -66,7 +64,7 @@ server {
    # that file is correctly served; if it doesn't, then the request is passed to
    # the front-end controller. This consistent behaviour means that we don't need
    # to specify custom rules for certain paths (e.g. images and other assets,
-    # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
+    # `/updater`, `/ocs-provider`), and thus
    # `try_files $uri $uri/ /index.php$request_uri`
    # always provides the desired behaviour.
    index index.php index.html /index.php$request_uri;
@@ -113,7 +111,7 @@ server {
    # to the URI, resulting in a HTTP 500 error response.
    location ~ \.php(?:$|/) {
        # Required for legacy support
-        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;

        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
        set $path_info $fastcgi_path_info;
@@ -134,7 +132,8 @@ server {
        fastcgi_max_temp_file_size 0;
    }

-    location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
+    # Serve static files
+    location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
        try_files $uri /index.php$request_uri;
        add_header Cache-Control "public, max-age=15778463, $asset_immutable";
        access_log off;     # Optional: Don't log access to assets
@@ -142,6 +141,7 @@ server {
        location ~ \.wasm$ {
            default_type application/wasm;
        }
+
    }

    location ~ \.woff2?$ {
@@ -0,0 +1,2 @@
+# min   hour    day     month   weekday command
+*/5     *       *       *       *       /usr/bin/php /app/www/public/cron.php 2>&1
@@ -1,9 +0,0 @@
-# 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 php -f /config/www/nextcloud/cron.php
@@ -1,23 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# make folders
-mkdir -p \
-    /config/crontabs
-
-## root
-# if crontabs do not exist in config
-if [[ ! -f /config/crontabs/root ]]; then
-    # copy crontab from system
-    if crontab -l -u root; then
-        crontab -l -u root >/config/crontabs/root
-    fi
-
-    # if crontabs still do not exist in config (were not copied from system)
-    # copy crontab from included defaults (using -n, do not overwrite an existing file)
-    cp -n /etc/crontabs/root /config/crontabs/
-fi
-sed -i "s|s6-setuidgid abc php[78] -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|" /config/crontabs/root
-# set permissions and import user crontabs
-lsiown root:root /config/crontabs/root
-crontab -u root /config/crontabs/root
@@ -1 +0,0 @@
-oneshot
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
@@ -3,30 +3,174 @@

 # create folders
 mkdir -p \
-    /config/www/nextcloud \
+    /app/www/public \
+    /config/www/nextcloud/apps \
+    /config/www/nextcloud/config \
+    /config/www/nextcloud/themes \
    /data

-# install app
-if [ ! -e /config/www/nextcloud/index.php ]; then
-    tar xf /app/nextcloud.tar.bz2 -C \
-        /config/www/nextcloud --strip-components=1
-    lsiown abc:abc -R \
-        /config/www/nextcloud
-    chmod +x /config/www/nextcloud/occ
+# migrate legacy install (copy inside container)
+if [ -f /config/www/nextcloud/version.php ]; then
+    echo "Migrating legacy install (this can take a while) ...)"
+    rsync -rlD --remove-source-files --exclude-from=/app/upgrade.exclude /config/www/nextcloud/ /app/www/public/
+    rm -rf /config/www/nextcloud/updater/
+    find \
+        /config/www/nextcloud/ \
+        -type d -empty \
+        ! -path "/config/www/nextcloud/apps" \
+        ! -path "/config/www/nextcloud/config" \
+        ! -path "/config/www/nextcloud/themes" \
+        -delete
+    touch /config/www/nextcloud/config/needs_migration
 fi

-# copy config
-if [[ ! -f /config/www/nextcloud/config/config.php ]]; then
-    cp /defaults/config.php /config/www/nextcloud/config/config.php
+# symlink config folders
+for dir in apps config themes; do
+    if [ "$(readlink /app/www/public/${dir})" != "/config/www/nextcloud/${dir}" ]; then
+        rm -rf "/app/www/public/${dir}"
+        ln -s "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
+        lsiown abc:abc "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
+    fi
+done
+
+# get versions
+image_version=$(php -r "require '/app/www/src/version.php'; echo implode('.', \$OC_Version);" 2>/dev/null)
+installed_version=$(php -r "require '/config/www/nextcloud/config/config.php'; echo \$CONFIG['version'];" 2>/dev/null)
+if [ "${installed_version}" = "" ]; then
+    installed_version="0.0.0.0"
 fi
+image_major="${image_version%%.*}"
+installed_major="${installed_version%%.*}"
+((max_upgrade = installed_major + 1))
+
+# compare versions
+vergte() { printf '%s\n%s' "${2}" "${1}" | sort -C -V; }
+vergt() { ! vergte "${2}" "${1}"; }
+verlte() { printf '%s\n%s' "${1}" "${2}" | sort -C -V; }
+verlt() { ! verlte "${2}" "${1}"; }
+
+if vergt "${installed_version}" "${image_version}"; then
+    echo "Can't start Nextcloud because the version of the data (${installed_version}) is higher than the docker image version (${image_version}) and downgrading is not supported. Are you sure you have pulled the newest image version?"
+    sleep infinity
+fi
+
+if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_major}" "${max_upgrade}"; then
+    echo "Can't start Nextcloud because the version of the data (${installed_version}) is more than one major version behind the docker image version (${image_version}) and upgrading more than one major version is not supported. Please run an image tagged for the major version ${max_upgrade} first."
+    sleep infinity
+fi
+
+if [ "${installed_version}" = "0.0.0.0" ] || [ ! -f /app/www/public/version.php ] || [ -z "$(ls -A /config/www/nextcloud/apps 2>/dev/null)" ]; then
+    touch /tmp/needs_install
+fi
+
+if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_version}" "${installed_version}"; then
+    touch /tmp/needs_upgrade
+fi
+
+# initialize nextcloud
+if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_install ] || [ -f /tmp/needs_upgrade ]; then
+    echo "Initializing nextcloud ${image_version} (this can take a while) ..."
+    if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
+        echo "Upgrading nextcloud from ${installed_version} ..."
+        shippedApps=$(jq -r .shippedApps[] /app/www/src/core/shipped.json)
+        for app in ${shippedApps}; do
+            rm -rf "/config/www/nextcloud/apps/${app}"
+        done
+    fi
+
+    rsync -rlD --exclude-from=/app/upgrade.exclude /app/www/src/ /app/www/public/
+    for dir in apps config themes; do
+        if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ] || [ -z "$(ls -A /app/www/public/${dir} 2>/dev/null)" ]; then
+            rsync -rlD --include "/${dir}" --exclude '/*' /app/www/src/ /config/www/nextcloud/
+        fi
+    done
+    if [ -z "$(ls -A /data/ 2>/dev/null)" ]; then
+        rsync -rlD --include "/data" --exclude '/*' /app/www/src/ /
+    fi
+
+    echo "Setting permissions"
+    lsiown abc:abc /data
+    lsiown -R abc:abc \
+        /app/www/public \
+        /config/www/nextcloud
+
+    if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
+        # Upgrade
+        occ upgrade
+    else
+        if [ "${installed_version}" = "0.0.0.0" ]; then
+            # Install
+            echo "New nextcloud instance"
+            echo "Please run the web-based installer on first connect!"
+        fi
+    fi
+
+    echo "Initializing finished"
+fi
+
+rm -f \
+    /config/www/nextcloud/config/needs_migration \
+    /tmp/needs_install \
+    /tmp/needs_upgrade

 # permissions
 lsiown abc:abc \
-    /config/www/nextcloud/config/config.php \
-    /data
+    /app/www/public \
+    /config/www/nextcloud

-if (occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
-    echo "Removing CODE Server"
-    APP=$(occ app:list --no-interaction | grep richdocumentscode | awk -F ' ' '{print $2}' | tr -d ':')
-    occ app:remove --no-interaction "${APP}" 2>/dev/null
+# setup config
+if occ config:system:get installed >/dev/null 2>&1; then
+    if ! occ config:system:get memcache.local >/dev/null 2>&1; then
+        occ config:system:set memcache.local --value='\\OC\\Memcache\\APCu'
+    fi
+    if ! occ config:system:get filelocking.enabled >/dev/null 2>&1; then
+        occ config:system:set filelocking.enabled --value=true --type=boolean
+    fi
+    if ! occ config:system:get memcache.locking >/dev/null 2>&1; then
+        occ config:system:set memcache.locking --value='\\OC\\Memcache\\APCu'
+    fi
+    if ! occ config:system:get datadirectory >/dev/null 2>&1; then
+        occ config:system:set datadirectory --value='/data'
+    fi
+    if ! occ config:system:get upgrade.disable-web >/dev/null 2>&1; then
+        occ config:system:set upgrade.disable-web --value=true --type=boolean
+    fi
+else
+    echo "After completing the web-based installer, restart the Nextcloud container to apply default memory caching and transactional file locking configurations."
+    echo "Alternatively, you can apply your own configurations by editing /config/www/nextcloud/config/config.php following the documentation:"
+    echo "https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html"
+    echo "https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/files_locking_transactional.html"
+fi
+
+# remove problematic apps
+for APP in richdocumentscode; do
+    if (occ app:list | grep -q " - ${APP}:") 2>/dev/null; then
+        echo "Removing ${APP}"
+    fi
+    APP_PATH=$(occ app:getpath "${APP}" 2>/dev/null)
+    if [ -z "${APP_PATH}" ] || [ ! -d "${APP_PATH}" ]; then
+        APP_PATH="/app/www/public/apps/${APP}"
+    fi
+    if [ -d "${APP_PATH}" ]; then
+        occ app:disable "${APP}" >/dev/null 2>&1
+    fi
+    APP_STATUS="$(occ config:app:get "${APP}" enabled 2>/dev/null)"
+    if [ "${APP_STATUS}" != "no" ] && [ -n "${APP_STATUS}" ]; then
+        occ config:app:set "${APP}" enabled --value="no" >/dev/null 2>&1
+    fi
+    occ app:remove "${APP}" >/dev/null 2>&1
+    rm -rf "${APP_PATH}"
+done
+
+# set data directory
+if [ ! -s /config/www/nextcloud/config/config.php ]; then
+    echo -e "<?php\n\$CONFIG = array (\n    'datadirectory' => '/data',\n);" >/config/www/nextcloud/config/config.php
+elif [ -f /config/www/nextcloud/config/config.php ]; then
+    sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php
+fi
+
+#modify javascript mime type and add .mjs support
+if [ -s /etc/nginx/mime.types ]; then
+    sed -i 's|\bjs;|js mjs;|g' /etc/nginx/mime.types
+    sed -i 's|\bapplication/javascript|text/javascript|g' /etc/nginx/mime.types
 fi
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+DEFAULT_CONF="/config/nginx/site-confs/default.conf"
+OLD_ROOT="root /config/www/nextcloud/;"
+NEW_ROOT="root /app/www/public;"
+
+if [[ -f "${DEFAULT_CONF}" ]] && grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
+    echo "updating root in ${DEFAULT_CONF}"
+    sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
+fi
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash

-sudo -u abc -s /bin/bash -c "php /config/www/nextcloud/occ $*"
+sudo -u abc -s /bin/bash -c "php /app/www/public/occ $*"
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-sudo -u abc -s /bin/bash -c "php /config/www/nextcloud/updater/updater.phar $*"
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-crontabs-config/run`