Bot Updating Package Versions

Fix uploading large files

.github/CONTRIBUTING.md

@@ -105,10 +105,10 @@ 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`.

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,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

.github/workflows/external_trigger.yml

@@ -7,22 +7,27 @@ jobs:
   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/develop'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
+          printf "# External trigger for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
+          if grep -q "^nextcloud_develop" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_develop\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\". ****"
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "External trigger running off of develop branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\`" >> $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
-          echo "**** Retrieving external version ****"
+          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 [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
+            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,
@@ -31,24 +36,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 "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
           image="linuxserver/nextcloud"
           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}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
-              | jq -r 'first(.manifests[].digest)')
+              digest=$(jq -r '.config.digest' <<< "${digest}");
-            digest=$(curl -s \
+            fi
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+          fi
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -60,45 +83,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 ****"
+            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/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 ****"
+            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
-            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 ****"
+            if [[ "${artifacts_found}" == "false" ]]; then
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/buildWithParameters?PACKAGE_CHECK=false \
+              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."
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-            echo "**** Sleeping 10 seconds until job starts ****"
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            sleep 10
+            else
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-            buildurl="${buildurl%$'\r'}"
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            echo "**** Jenkins job build url: ${buildurl} ****"
+              if [[ "${artifacts_found}" == "true" ]]; then
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
+              fi
-            curl -iX POST \
+              response=$(curl -iX POST \
-              "${buildurl}submitDescription" \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-              --data-urlencode "Submit=Submit"
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-            echo "**** Notifying Discord ****"
+              sleep 10
-            TRIGGER_REASON="A version change was detected for nextcloud tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              buildurl="${buildurl%$'\r'}"
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              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

.github/workflows/external_trigger_scheduler.yml

@@ -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: ****"
+          printf "# External trigger scheduler for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          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:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              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." >> $GITHUB_STEP_SUMMARY
-                echo "Triggering external trigger workflow for branch ${br}" >> $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 due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
-                echo "Skipping branch ${br} 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 due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/package_trigger.yml

@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-develop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/develop'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\` 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/develop/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 develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\". ****"
-          echo "Package trigger running off of develop branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/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"

.github/workflows/package_trigger_scheduler.yml

@@ -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: ****"
+          printf "# Package trigger scheduler for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          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:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
           do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+              continue
-            if [ "${br}" == "${ls_branch}" ]; then
+            fi
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml)
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/Jenkinsfile >/dev/null 2>&1; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
+              skipped_branches="${skipped_branches}${br} "
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                  -H "Accept: application/vnd.github.v3+json" \
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/readme-vars.yml)
-                  https://api.github.com/repos/linuxserver/docker-nextcloud/actions/workflows/package_trigger.yml/dispatches
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                sleep 30
+                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 "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $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} ****"
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
-          echo "**** Notifying Discord ****"
+            if [[ -n "${triggered_branches}" ]]; then
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-            "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"}],
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-nextcloud/activity/ \n"
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              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

.github/workflows/permissions.yml

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

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -19,45 +19,44 @@ RUN \
     gnu-libiconv \
     imagemagick \
     libxml2 \
-    php82-apcu \
+    php83-apcu \
-    php82-bcmath \
+    php83-bcmath \
-    php82-bz2 \
+    php83-bz2 \
-    php82-dom \
+    php83-dom \
-    php82-exif \
+    php83-exif \
-    php82-ftp \
+    php83-ftp \
-    php82-gd \
+    php83-gd \
-    php82-gmp \
+    php83-gmp \
-    php82-imap \
+    php83-imap \
-    php82-intl \
+    php83-intl \
-    php82-ldap \
+    php83-ldap \
-    php82-opcache \
+    php83-opcache \
-    php82-pcntl \
+    php83-pcntl \
-    php82-pdo_mysql \
+    php83-pdo_mysql \
-    php82-pdo_pgsql \
+    php83-pdo_pgsql \
-    php82-pdo_sqlite \
+    php83-pdo_sqlite \
-    php82-pecl-imagick \
+    php83-pecl-imagick \
-    php82-pecl-memcached \
+    php83-pecl-mcrypt \
-    php82-pecl-smbclient \
+    php83-pecl-memcached \
-    php82-pgsql \
+    php83-pecl-smbclient \
-    php82-posix \
+    php83-pgsql \
-    php82-redis \
+    php83-posix \
-    php82-sodium \
+    php83-redis \
-    php82-sqlite3 \
+    php83-sodium \
-    php82-sysvsem \
+    php83-sqlite3 \
-    php82-xmlreader \
+    php83-sysvsem \
+    php83-xmlreader \
     rsync \
     samba-client \
     sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php82-pecl-mcrypt && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/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/php82/php-fpm.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/php82/conf.d/apcu.ini && \
+  } >> /etc/php83/conf.d/apcu.ini && \
   { \
     echo 'opcache.enable=1'; \
     echo 'opcache.interned_strings_buffer=32'; \
@@ -67,16 +66,16 @@ RUN \
     echo 'opcache.revalidate_freq=60'; \
     echo 'opcache.jit=1255'; \
     echo 'opcache.jit_buffer_size=128M'; \
-  } >> "/etc/php82/conf.d/00_opcache.ini" && \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
   { \
-    echo 'memory_limit=512M'; \
+    echo 'memory_limit=-1'; \
-    echo 'upload_max_filesize=512M'; \
+    echo 'upload_max_filesize=100G'; \
-    echo 'post_max_size=512M'; \
+    echo 'post_max_size=100G'; \
-    echo 'max_input_time=300'; \
+    echo 'max_input_time=3600'; \
-    echo 'max_execution_time=300'; \
+    echo 'max_execution_time=3600'; \
     echo 'output_buffering=0'; \
     echo 'always_populate_raw_post_data=-1'; \
-  } >> "/etc/php82/conf.d/nextcloud.ini" && \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
   echo "**** install nextcloud ****" && \
   mkdir -p \
     /app/www/src/ && \
@@ -93,6 +92,7 @@ RUN \
   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/*

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -19,45 +19,44 @@ RUN \
     gnu-libiconv \
     imagemagick \
     libxml2 \
-    php82-apcu \
+    php83-apcu \
-    php82-bcmath \
+    php83-bcmath \
-    php82-bz2 \
+    php83-bz2 \
-    php82-dom \
+    php83-dom \
-    php82-exif \
+    php83-exif \
-    php82-ftp \
+    php83-ftp \
-    php82-gd \
+    php83-gd \
-    php82-gmp \
+    php83-gmp \
-    php82-imap \
+    php83-imap \
-    php82-intl \
+    php83-intl \
-    php82-ldap \
+    php83-ldap \
-    php82-opcache \
+    php83-opcache \
-    php82-pcntl \
+    php83-pcntl \
-    php82-pdo_mysql \
+    php83-pdo_mysql \
-    php82-pdo_pgsql \
+    php83-pdo_pgsql \
-    php82-pdo_sqlite \
+    php83-pdo_sqlite \
-    php82-pecl-imagick \
+    php83-pecl-imagick \
-    php82-pecl-memcached \
+    php83-pecl-mcrypt \
-    php82-pecl-smbclient \
+    php83-pecl-memcached \
-    php82-pgsql \
+    php83-pecl-smbclient \
-    php82-posix \
+    php83-pgsql \
-    php82-redis \
+    php83-posix \
-    php82-sodium \
+    php83-redis \
-    php82-sqlite3 \
+    php83-sodium \
-    php82-sysvsem \
+    php83-sqlite3 \
-    php82-xmlreader \
+    php83-sysvsem \
+    php83-xmlreader \
     rsync \
     samba-client \
     sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php82-pecl-mcrypt && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/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/php82/php-fpm.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/php82/conf.d/apcu.ini && \
+  } >> /etc/php83/conf.d/apcu.ini && \
   { \
     echo 'opcache.enable=1'; \
     echo 'opcache.interned_strings_buffer=32'; \
@@ -67,16 +66,16 @@ RUN \
     echo 'opcache.revalidate_freq=60'; \
     echo 'opcache.jit=1255'; \
     echo 'opcache.jit_buffer_size=128M'; \
-  } >> "/etc/php82/conf.d/00_opcache.ini" && \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
   { \
-    echo 'memory_limit=512M'; \
+    echo 'memory_limit=-1'; \
-    echo 'upload_max_filesize=512M'; \
+    echo 'upload_max_filesize=100G'; \
-    echo 'post_max_size=512M'; \
+    echo 'post_max_size=100G'; \
-    echo 'max_input_time=300'; \
+    echo 'max_input_time=3600'; \
-    echo 'max_execution_time=300'; \
+    echo 'max_execution_time=3600'; \
     echo 'output_buffering=0'; \
     echo 'always_populate_raw_post_data=-1'; \
-  } >> "/etc/php82/conf.d/nextcloud.ini" && \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
   echo "**** install nextcloud ****" && \
   mkdir -p \
     /app/www/src/ && \
@@ -93,6 +92,7 @@ RUN \
   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/*

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
   }
   // Input to determine if this is a package check
   parameters {
-     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+    string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
   }
   // Configuration for the variables used for this specific repo
   environment {
@@ -16,6 +16,9 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
+    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
+    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-nextcloud'
@@ -30,14 +33,28 @@ pipeline {
     CI_PORT='443'
     CI_SSL='true'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
-    CI_AUTH='user:password'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
+    stage("Set git config"){
+      steps{
+        sh '''#!/bin/bash
+              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
+              chmod 600 /config/.ssh/id_sign
+              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
+              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
+              git config --global gpg.format ssh
+              git config --global user.signingkey /config/.ssh/id_sign
+              git config --global commit.gpgsign true
+        '''
+      }
+    }
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
+        echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
               containers=$(docker ps -aq)
               if [[ -n "${containers}" ]]; then
@@ -58,11 +75,16 @@ pipeline {
           env.COMMIT_SHA = sh(
             script: '''git rev-parse HEAD''',
             returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
         }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
         script{
           env.LS_RELEASE_NUMBER = sh(
             script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -120,7 +142,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
             returnStdout: true).trim()
 
           def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -138,7 +160,7 @@ pipeline {
           }
 
           if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
               env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
             }
             println("SEMVER: ${env.SEMVER}")
@@ -169,6 +191,7 @@ pipeline {
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
         }
       }
     }
@@ -193,6 +216,7 @@ pipeline {
           env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
         }
       }
     }
@@ -217,6 +241,7 @@ pipeline {
           env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
         }
       }
     }
@@ -239,9 +264,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -260,8 +287,15 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=develop -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Cloned repo paths for templating:
-              # Stage 1 - Jenkinsfile update
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch develop of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch develop of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch develop --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
@@ -270,16 +304,17 @@ pipeline {
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "Jenkinsfile is up to date."
               fi
-              # Stage 2 - Delete old templates
+              echo "Starting Stage 2 - Delete old templates"
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -294,15 +329,45 @@ pipeline {
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
                 echo "No templates to delete"
               fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 2.5 - Update init diagram"
+              if ! grep -q 'init_diagram:' readme-vars.yml; then
+                echo "Adding the key 'init_diagram' to readme-vars.yml"
+                sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
+                sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
+              fi
+              mkdir -p ${TEMPDIR}/d2
+              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:develop
+              ls -al ${TEMPDIR}/d2
+              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-develop.d2\\")" readme-vars.yml
+              if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
+                echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f develop
+                cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
+                git add readme-vars.yml
+                git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Init diagram is unchanged"
+              fi
+              echo "Starting Stage 3 - Update templates"
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -323,31 +388,50 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
               fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
               mkdir -p ${TEMPDIR}/docs
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                 cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                 git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
               fi
               mkdir -p ${TEMPDIR}/unraid
-              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
               if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -358,7 +442,42 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
               fi
               rm -Rf ${TEMPDIR}'''
         script{
@@ -405,23 +524,27 @@ pipeline {
       }
     }
     /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
        ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
-    stage("GitLab Mirror"){
+    stage("GitLab Mirror and Quay.io Visibility"){
       when {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps{
         sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
+            "name":"'${LS_REPO}'",
-             "mirror":true,\
+            "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
+            "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
+            "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+            "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
+        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
+          -d '{"visibility":"public"}' ||: '''
       } 
     }
     /* ###############
@@ -452,7 +575,42 @@ pipeline {
           --label \"org.opencontainers.image.title=Nextcloud\" \
           --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=true --sbom=true --builder=container --load \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        sh '''#! /bin/bash
+              set -e
+              IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+              for i in "${CACHE[@]}"; do
+                docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+              done
+           '''
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry_backoff(5,5) {
+              sh '''#! /bin/bash
+                    set -e
+                    echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                    echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                    echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                    echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                    if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                      for i in "${CACHE[@]}"; do
+                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                      done
+                      for p in $(jobs -p); do
+                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                      done
+                    fi
+                '''
+          }
+        }
       }
     }
     // Build MultiArch Docker containers for push to LS Repo
@@ -483,7 +641,42 @@ pipeline {
               --label \"org.opencontainers.image.title=Nextcloud\" \
               --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh '''#! /bin/bash
+                  set -e
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
+            }
           }
         }
         stage('Build ARM64') {
@@ -492,10 +685,6 @@ pipeline {
           }
           steps {
             echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
             sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
             sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
@@ -511,17 +700,49 @@ pipeline {
               --label \"org.opencontainers.image.title=Nextcloud\" \
               --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            sh '''#! /bin/bash
-            retry(5) {
+                  set -e
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
             }
             sh '''#! /bin/bash
                   containers=$(docker ps -aq)
                   if [[ -n "${containers}" ]]; then
                     docker stop ${containers}
                   fi
-                  docker system prune -af --volumes || : '''
+                  docker system prune -af --volumes || :
+               '''
           }
         }
       }
@@ -537,7 +758,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -558,7 +779,8 @@ pipeline {
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -624,18 +846,27 @@ pipeline {
           }
           sh '''#! /bin/bash
                 set -e
+                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
+                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
+                  if [ -n "${CI_DOCKERENV}" ]; then
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
+                  else
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
+                  fi
+                fi
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
+                -e RELEASE_TAG=\"develop\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -645,6 +876,7 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -660,43 +892,23 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        retry_backoff(5,5) {
-          [
+          sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+                set -e
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-            usernameVariable: 'DOCKERUSER',
+                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
-            passwordVariable: 'DOCKERPASS'
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-          ],
+                  for i in "${CACHE[@]}"; do
-          [
+                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-            $class: 'UsernamePasswordMultiBinding',
+                          CACHEIMAGE=${i}
-            credentialsId: 'Quay.io-Robot',
+                      fi
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:develop
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
-                    docker push ${PUSHIMAGE}:develop
-                    docker push ${PUSHIMAGE}:${META_TAG}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
                   done
-               '''
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:develop -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-          }
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+              '''
         }
       }
     }
@@ -707,85 +919,34 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        retry_backoff(5,5) {
-          [
+          sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+                set -e
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-            usernameVariable: 'DOCKERUSER',
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-            passwordVariable: 'DOCKERPASS'
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-          ],
+                  for i in "${CACHE[@]}"; do
-          [
+                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-            $class: 'UsernamePasswordMultiBinding',
+                          CACHEIMAGE=${i}
-            credentialsId: 'Quay.io-Robot',
+                      fi
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-develop
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-develop
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-develop
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-develop
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:develop || :
-                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
-                    docker manifest annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm64v8-develop --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-develop")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-develop ${MANIFESTIMAGE}:amd64-develop
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:develop
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
-                    fi
                   done
-               '''
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-develop -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-          }
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-develop -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                  fi
+                done
+              '''
         }
       }
     }
@@ -806,14 +967,14 @@ pipeline {
              "object": "'${COMMIT_SHA}'",\
              "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to develop",\
              "type": "commit",\
-             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "develop",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -854,39 +1015,6 @@ EOF
           ) '''
       }
     }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
-      when {
-        environment name: 'CHANGE_ID', value: ''
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
-      }
-    }
     // If this is a Pull request send the CI link as a comment on it
     stage('Pull Request Comment') {
       when {
@@ -971,18 +1099,53 @@ EOF
      ###################### */
   post {
     always {
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
       script{
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
         if (env.EXIT_STATUS == "ABORTED"){
           sh 'echo "build aborted"'
-        }
+        }else{
-        else if (currentBuild.currentResult == "SUCCESS"){
+          if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
+            if (env.GITHUBIMAGE =~ /lspipepr/){
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+              env.JOB_WEBHOOK_COLOUR=3957028
-        }
+              env.JOB_WEBHOOK_FOOTER='PR Build'
-        else {
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }else{
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=16711680
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
+                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
+                 "timestamp": "'${JOB_DATE}'",\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
@@ -1000,3 +1163,20 @@ EOF
     }
   }
 }
+
+def retry_backoff(int max_attempts, int power_base, Closure c) {
+  int n = 0
+  while (n < max_attempts) {
+    try {
+      c()
+      return
+    } catch (err) {
+      if ((n + 1) >= max_attempts) {
+        throw err
+      }
+      sleep(power_base ** n)
+      n++
+    }
+  }
+  return
+}

README.md

@@ -28,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,7 +37,7 @@ Find us at:
 [![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%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%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/latest/index.html)
+[![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.
 
@@ -47,7 +47,7 @@ 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:develop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
@@ -106,11 +106,13 @@ If you are using a reverse proxy which validates certificates, you need to [disa
 
 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:develop
@@ -120,7 +122,7 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - /path/to/appdata:/config
+      - /path/to/nextcloud/config:/config
       - /path/to/data:/data
     ports:
       - 443:443
@@ -136,7 +138,7 @@ 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:develop
@@ -148,11 +150,11 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | 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)
@@ -224,7 +226,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## 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:
 
@@ -289,24 +291,10 @@ Below are the instructions for updating containers:
     docker image prune
     ```
 
-### 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`
-
-**warning**: 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).
-
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-**tip**: 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
 
@@ -321,16 +309,21 @@ docker build \
   -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.

jenkins-vars.yml

@@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/ser
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
   - LS_USER = 'linuxserver'
@@ -23,6 +22,6 @@ repo_vars:
   - CI_PORT='443'
   - CI_SSL='true'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV=''
-  - CI_AUTH='user:password'
+  - CI_AUTH=''
   - CI_WEBPATH=''

package_versions.txt

@@ -1,386 +1,422 @@
-NAME                                                                     VERSION                          TYPE         
+NAME                                   VERSION                          TYPE                          
-@nextcloud/text                                                          28.0.0-dev.1                     npm           
+Hidden Input                           1, 0, 0, 0                       dotnet                         
-ExecutesacommandandpassesthestdiostreamsofthecreatedprocesstoTCPsockets  1.0.0.0                          dotnet        
+Process Wrapper                        1.0.0.0                          dotnet        (+1 duplicate)   
-activity                                                                 2.20.0                           npm           
+activity                               4.0.0                            npm                            
-alpine-baselayout                                                        3.4.3-r1                         apk           
+alpine-baselayout                      3.6.5-r0                         apk                            
-alpine-baselayout-data                                                   3.4.3-r1                         apk           
+alpine-baselayout-data                 3.6.5-r0                         apk                            
-alpine-keys                                                              2.4-r1                           apk           
+alpine-keys                            2.4-r1                           apk                            
-alpine-release                                                           3.18.4-r0                        apk           
+alpine-release                         3.20.5-r0                        apk                            
-alsa-lib                                                                 1.2.9-r1                         apk           
+alsa-lib                               1.2.11-r0                        apk                            
-amphp/amp                                                                v2.6.2                           php-composer  
+amphp/amp                              v2.6.4                           php-composer  (+1 duplicate)   
-amphp/byte-stream                                                        v1.8.1                           php-composer  
+amphp/byte-stream                      v1.8.2                           php-composer  (+1 duplicate)   
-amphp/parallel                                                           v1.4.3                           php-composer  
+amphp/parallel                         v1.4.3                           php-composer                   
-amphp/parser                                                             v1.1.0                           php-composer  
+amphp/parser                           v1.1.1                           php-composer                   
-amphp/process                                                            v1.1.4                           php-composer  
+amphp/process                          v1.1.7                           php-composer                   
-amphp/serialization                                                      v1.0.0                           php-composer  
+amphp/serialization                    v1.0.0                           php-composer                   
-amphp/sync                                                               v1.4.2                           php-composer  
+amphp/sync                             v1.4.2                           php-composer                   
-aom-libs                                                                 3.6.1-r0                         apk           
+aom-libs                               3.9.1-r0                         apk                            
-apache2-utils                                                            2.4.58-r0                        apk           
+apache2-utils                          2.4.62-r0                        apk                            
-apk-tools                                                                2.14.0-r2                        apk           
+apk-tools                              2.14.4-r1                        apk                            
-apr                                                                      1.7.4-r0                         apk           
+app_api                                1.0.0                            npm                            
-apr-util                                                                 1.6.3-r1                         apk           
+apr                                    1.7.5-r0                         apk                            
-argon2-libs                                                              20190702-r4                      apk           
+apr-util                               1.6.3-r1                         apk                            
-avahi-libs                                                               0.8-r13                          apk           
+argon2-libs                            20190702-r5                      apk                            
-aws/aws-crt-php                                                          v1.0.2                           php-composer  
+aws/aws-crt-php                        v1.2.7                           php-composer                   
-aws/aws-sdk-php                                                          3.240.8                          php-composer  
+aws/aws-sdk-php                        3.324.13                         php-composer                   
-bantu/ini-get-wrapper                                                    v1.0.1                           php-composer  
+bamarni/composer-bin-plugin            1.8.2                            php-composer  (+1 duplicate)   
-bash                                                                     5.2.15-r5                        apk           
+bantu/ini-get-wrapper                  v1.0.1                           php-composer                   
-beberlei/assert                                                          v3.3.1                           php-composer  
+bash                                   5.2.26-r0                        apk                            
-brick/math                                                               0.9.2                            php-composer  
+brick/math                             0.12.1                           php-composer                   
-brotli-libs                                                              1.0.9-r14                        apk           
+brotli-libs                            1.1.0-r2                         apk                            
-bruteforcesettings                                                       2.8.0                            npm           
+bruteforcesettings                     4.0.0                            npm                            
-busybox                                                                  1.36.1-r4                        apk           
+busybox                                1.36.1-r29                       apk                            
-busybox-binsh                                                            1.36.1-r4                        apk           
+busybox-binsh                          1.36.1-r29                       apk                            
-c-client                                                                 2007f-r15                        apk           
+c-ares                                 1.33.1-r0                        apk                            
-ca-certificates                                                          20230506-r0                      apk           
+c-client                               2007f-r15                        apk                            
-ca-certificates-bundle                                                   20230506-r0                      apk           
+ca-certificates                        20241121-r1                      apk                            
-cairo                                                                    1.17.8-r1                        apk           
+ca-certificates-bundle                 20241121-r1                      apk                            
-cairo-gobject                                                            1.17.8-r1                        apk           
+catatonit                              0.2.0-r0                         apk                            
-christian-riesen/base32                                                  1.6.0                            php-composer  
+christian-riesen/base32                1.6.0                            php-composer                   
-cjson                                                                    1.7.15-r4                        apk           
+cjson                                  1.7.18-r0                        apk                            
-coreutils                                                                9.3-r1                           apk           
+composer                               2.8.4                            binary                         
-cups-libs                                                                2.4.7-r0                         apk           
+composer/pcre                          3.3.1                            php-composer                   
-curl                                                                     8.4.0-r0                         apk           
+composer/semver                        3.4.2                            php-composer                   
-cweagans/composer-patches                                                1.7.3                            php-composer  
+composer/xdebug-handler                3.0.5                            php-composer                   
-darsyn/ip                                                                4.1.0                            php-composer  
+coreutils                              9.5-r2                           apk                            
-dbus-libs                                                                1.14.8-r0                        apk           
+coreutils-env                          9.5-r2                           apk                            
-deepdiver/zipstreamer                                                    2.0.0                            php-composer  
+coreutils-fmt                          9.5-r2                           apk                            
-deepdiver1975/tarstreamer                                                v2.1.0                           php-composer  
+coreutils-sha512sum                    9.5-r2                           apk                            
-doctrine/cache                                                           2.2.0                            php-composer  
+curl                                   8.11.1-r0                        apk                            
-doctrine/dbal                                                            3.7.0                            php-composer  
+cweagans/composer-patches              1.7.3                            php-composer                   
-doctrine/deprecations                                                    1.1.2                            php-composer  
+dbus-libs                              1.14.10-r1                       apk                            
-doctrine/event-manager                                                   1.2.0                            php-composer  
+deepdiver/zipstreamer                  v2.0.3                           php-composer                   
-doctrine/lexer                                                           1.2.3                            php-composer  
+deepdiver1975/tarstreamer              v2.1.0                           php-composer                   
-egulias/email-validator                                                  3.2.5                            php-composer  
+dnoegel/php-xdg-base-dir               v0.1.1                           php-composer                   
-ffmpeg                                                                   6.0-r15                          apk           
+doctrine/cache                         2.2.0                            php-composer                   
-ffmpeg-libavcodec                                                        6.0-r15                          apk           
+doctrine/dbal                          3.9.1                            php-composer                   
-ffmpeg-libavdevice                                                       6.0-r15                          apk           
+doctrine/deprecations                  1.1.3                            php-composer  (+1 duplicate)   
-ffmpeg-libavfilter                                                       6.0-r15                          apk           
+doctrine/event-manager                 1.2.0                            php-composer                   
-ffmpeg-libavformat                                                       6.0-r15                          apk           
+doctrine/lexer                         3.0.1                            php-composer                   
-ffmpeg-libavutil                                                         6.0-r15                          apk           
+egulias/email-validator                4.0.2                            php-composer                   
-ffmpeg-libpostproc                                                       6.0-r15                          apk           
+felixfbecker/advanced-json-rpc         v3.2.1                           php-composer                   
-ffmpeg-libswresample                                                     6.0-r15                          apk           
+felixfbecker/language-server-protocol  v1.5.2                           php-composer                   
-ffmpeg-libswscale                                                        6.0-r15                          apk           
+ffmpeg                                 6.1.1-r8                         apk                            
-fgrosse/phpasn1                                                          v2.3.0                           php-composer  
+ffmpeg-libavcodec                      6.1.1-r8                         apk                            
-files_pdfviewer                                                          2.9.0                            npm           
+ffmpeg-libavdevice                     6.1.1-r8                         apk                            
-firstrunwizard                                                           2.17.0                           npm           
+ffmpeg-libavfilter                     6.1.1-r8                         apk                            
-flac-libs                                                                1.4.3-r0                         apk           
+ffmpeg-libavformat                     6.1.1-r8                         apk                            
-fontconfig                                                               2.14.2-r3                        apk           
+ffmpeg-libavutil                       6.1.1-r8                         apk                            
-freetype                                                                 2.13.0-r5                        apk           
+ffmpeg-libpostproc                     6.1.1-r8                         apk                            
-fribidi                                                                  1.0.13-r0                        apk           
+ffmpeg-libswresample                   6.1.1-r8                         apk                            
-fusonic/linq                                                             v1.1.0                           php-composer  
+ffmpeg-libswscale                      6.1.1-r8                         apk                            
-fusonic/opengraph                                                        v2.2.0                           php-composer  
+fftw-double-libs                       3.3.10-r5                        apk                            
-gdbm                                                                     1.23-r1                          apk           
+fidry/cpu-core-counter                 1.2.0                            php-composer                   
-gdk-pixbuf                                                               2.42.10-r5                       apk           
+files_downloadlimit                    4.0.0                            npm                            
-ghostscript                                                              10.02.0-r0                       apk           
+files_pdfviewer                        4.0.0                            npm                            
-giggsey/libphonenumber-for-php-lite                                      8.13.12                          php-composer  
+findutils                              4.9.0-r5                         apk                            
-git                                                                      2.40.1-r0                        apk           
+firstrunwizard                         4.0.0                            npm                            
-glib                                                                     2.76.4-r0                        apk           
+fontconfig                             2.15.0-r1                        apk                            
-glslang-libs                                                             1.3.243.0-r1                     apk           
+freetype                               2.13.2-r0                        apk                            
-gmp                                                                      6.2.1-r3                         apk           
+fribidi                                1.0.15-r0                        apk                            
-gnu-libiconv                                                             1.17-r1                          apk           
+fusonic/opengraph                      v2.3.0                           php-composer                   
-gnu-libiconv-libs                                                        1.17-r1                          apk           
+gdbm                                   1.23-r1                          apk                            
-gnutls                                                                   3.8.0-r2                         apk           
+giflib                                 5.2.2-r0                         apk                            
-graphite2                                                                1.3.14-r5                        apk           
+giggsey/libphonenumber-for-php-lite    8.13.48                          php-composer                   
-guzzlehttp/guzzle                                                        7.5.0                            php-composer  
+git                                    2.45.3-r0                        apk                            
-guzzlehttp/promises                                                      1.5.2                            php-composer  
+git-init-template                      2.45.3-r0                        apk                            
-guzzlehttp/psr7                                                          2.4.5                            php-composer  
+glib                                   2.80.5-r0                        apk                            
-guzzlehttp/uri-template                                                  v0.2.0                           php-composer  
+glslang-libs                           1.3.261.1-r0                     apk                            
-harfbuzz                                                                 7.3.0-r0                         apk           
+gmp                                    6.3.0-r1                         apk                            
-hexogen/kdtree                                                           v0.2.5                           php-composer  
+gnu-libiconv                           1.17-r2                          apk                            
-hwdata-pci                                                               0.370-r0                         apk           
+gnu-libiconv-libs                      1.17-r2                          apk                            
-icewind/searchdav                                                        v3.0.1                           php-composer  
+gnutls                                 3.8.5-r0                         apk                            
-icewind/smb                                                              v3.5.4                           php-composer  
+graphite2                              1.3.14-r6                        apk                            
-icewind/streams                                                          v0.7.7                           php-composer  
+guzzlehttp/guzzle                      7.9.2                            php-composer                   
-icu-data-en                                                              73.2-r2                          apk           
+guzzlehttp/promises                    2.0.4                            php-composer                   
-icu-libs                                                                 73.2-r2                          apk           
+guzzlehttp/psr7                        2.7.0                            php-composer                   
-imagemagick                                                              7.1.1.13-r1                      apk           
+guzzlehttp/uri-template                v1.0.3                           php-composer                   
-imagemagick-libs                                                         7.1.1.13-r1                      apk           
+harfbuzz                               8.5.0-r0                         apk                            
-jansson                                                                  2.14-r3                          apk           
+hexogen/kdtree                         v0.2.6                           php-composer                   
-jbig2dec                                                                 0.19-r3                          apk           
+hwdata-pci                             0.382-r0                         apk                            
-jq                                                                       1.6-r3                           apk           
+icewind/searchdav                      v3.1.0                           php-composer                   
-justinrainbow/json-schema                                                5.2.10                           php-composer  
+icewind/smb                            v3.5.4                           php-composer                   
-lame-libs                                                                3.100-r5                         apk           
+icewind/streams                        v0.7.7                           php-composer  (+1 duplicate)   
-laravel/serializable-closure                                             v1.2.2                           php-composer  
+icu-data-en                            74.2-r0                          apk                            
-lcms2                                                                    2.15-r2                          apk           
+icu-libs                               74.2-r0                          apk                            
-ldb                                                                      2.7.2-r1                         apk           
+imagemagick                            7.1.1.32-r2                      apk                            
-league/flysystem                                                         2.5.0                            php-composer  
+imagemagick-jpeg                       7.1.1.32-r2                      apk                            
-league/mime-type-detection                                               1.11.0                           php-composer  
+imagemagick-jxl                        7.1.1.32-r2                      apk                            
-league/uri                                                               6.4.0                            php-composer  
+imagemagick-libs                       7.1.1.32-r2                      apk                            
-league/uri-interfaces                                                    2.2.0                            php-composer  
+imagemagick-webp                       7.1.1.32-r2                      apk                            
-libacl                                                                   2.3.1-r3                         apk           
+imath                                  3.1.12-r0                        apk                            
-libarchive                                                               3.7.2-r0                         apk           
+jansson                                2.14-r4                          apk                            
-libass                                                                   0.17.1-r0                        apk           
+jq                                     1.7.1-r0                         apk                            
-libasyncns                                                               0.8-r1                           apk           
+justinrainbow/json-schema              5.3.0                            php-composer                   
-libattr                                                                  2.5.1-r4                         apk           
+kornrunner/blurhash                    v1.2.2                           php-composer                   
-libavif                                                                  0.11.1-r2                        apk           
+lame-libs                              3.100-r5                         apk                            
-libblkid                                                                 2.38.1-r8                        apk           
+laravel/serializable-closure           v1.3.5                           php-composer                   
-libbluray                                                                1.3.4-r0                         apk           
+lcms2                                  2.16-r0                          apk                            
-libbsd                                                                   0.11.7-r1                        apk           
+lcobucci/clock                         3.0.0                            php-composer                   
-libbz2                                                                   1.0.8-r5                         apk           
+ldb                                    2.8.2-r0                         apk                            
-libc-utils                                                               0.7.2-r5                         apk           
+league/flysystem                       2.5.0                            php-composer                   
-libcap2                                                                  2.69-r0                          apk           
+league/mime-type-detection             1.15.0                           php-composer                   
-libcrypto3                                                               3.1.4-r0                         apk           
+libSvtAv1Enc                           2.0.0-r1                         apk                            
-libcurl                                                                  8.4.0-r0                         apk           
+libacl                                 2.3.2-r0                         apk                            
-libdav1d                                                                 1.2.1-r0                         apk           
+libarchive                             3.7.7-r0                         apk                            
-libde265                                                                 1.0.12-r0                        apk           
+libass                                 0.17.2-r0                        apk                            
-libdrm                                                                   2.4.115-r4                       apk           
+libasyncns                             0.8-r3                           apk                            
-libedit                                                                  20221030.3.1-r1                  apk           
+libattr                                2.5.2-r0                         apk                            
-libevent                                                                 2.1.12-r6                        apk           
+libauth-samba                          4.19.9-r0                        apk                            
-libexpat                                                                 2.5.0-r1                         apk           
+libavif                                1.0.4-r0                         apk                            
-libffi                                                                   3.4.4-r2                         apk           
+libblkid                               2.40.1-r1                        apk                            
-libformw                                                                 6.4_p20230506-r0                 apk           
+libbluray                              1.3.4-r1                         apk                            
-libgcc                                                                   12.2.1_git20220924-r10           apk           
+libbsd                                 0.12.2-r0                        apk                            
-libgomp                                                                  12.2.1_git20220924-r10           apk           
+libbz2                                 1.0.8-r6                         apk                            
-libheif                                                                  1.16.2-r0                        apk           
+libcap2                                2.70-r0                          apk                            
-libhwy                                                                   1.0.4-r1                         apk           
+libcrypto3                             3.3.2-r1                         apk                            
-libice                                                                   1.1.1-r2                         apk           
+libcurl                                8.11.1-r0                        apk                            
-libidn2                                                                  2.3.4-r1                         apk           
+libdav1d                               1.4.2-r0                         apk                            
-libintl                                                                  0.21.1-r7                        apk           
+libdovi                                3.3.0-r0                         apk                            
-libjpeg-turbo                                                            2.1.5.1-r3                       apk           
+libdrm                                 2.4.120-r0                       apk                            
-libjxl                                                                   0.8.2-r0                         apk           
+libeconf                               0.6.3-r0                         apk                            
-libldap                                                                  2.6.5-r0                         apk           
+libedit                                20240517.3.1-r0                  apk                            
-libltdl                                                                  2.4.7-r2                         apk           
+libevent                               2.1.12-r7                        apk                            
-libmcrypt                                                                2.5.8-r10                        apk           
+libexpat                               2.6.4-r0                         apk                            
-libmd                                                                    1.0.4-r2                         apk           
+libffi                                 3.4.6-r0                         apk                            
-libmemcached-libs                                                        1.1.4-r1                         apk           
+libflac                                1.4.3-r1                         apk                            
-libmount                                                                 2.38.1-r8                        apk           
+libformw                               6.4_p20240420-r2                 apk                            
-libncursesw                                                              6.4_p20230506-r0                 apk           
+libgcc                                 13.2.1_git20240309-r0            apk                            
-libogg                                                                   1.3.5-r4                         apk           
+libgomp                                13.2.1_git20240309-r0            apk                            
-libopenmpt                                                               0.7.2-r0                         apk           
+libhwy                                 1.0.7-r0                         apk                            
-libpanelw                                                                6.4_p20230506-r0                 apk           
+libice                                 1.1.1-r6                         apk                            
-libpciaccess                                                             0.17-r2                          apk           
+libidn2                                2.3.7-r0                         apk                            
-libplacebo                                                               5.264.1-r1                       apk           
+libintl                                0.22.5-r0                        apk                            
-libpng                                                                   1.6.39-r3                        apk           
+libjpeg-turbo                          3.0.3-r0                         apk                            
-libpq                                                                    15.4-r0                          apk           
+libjxl                                 0.10.2-r0                        apk                            
-libproc2                                                                 4.0.4-r0                         apk           
+libldap                                2.6.8-r0                         apk                            
-libpulse                                                                 16.1-r10                         apk           
+libltdl                                2.4.7-r3                         apk                            
-libraw                                                                   0.21.1-r1                        apk           
+libmcrypt                              2.5.8-r10                        apk                            
-librist                                                                  0.2.7-r0                         apk           
+libmd                                  1.1.0-r0                         apk                            
-librsvg                                                                  2.56.3-r0                        apk           
+libmemcached-libs                      1.1.4-r1                         apk                            
-libsasl                                                                  2.1.28-r4                        apk           
+libmount                               2.40.1-r1                        apk                            
-libsm                                                                    1.2.4-r1                         apk           
+libncursesw                            6.4_p20240420-r2                 apk                            
-libsmbclient                                                             4.18.8-r0                        apk           
+libogg                                 1.3.5-r5                         apk                            
-libsndfile                                                               1.2.0-r2                         apk           
+libopenmpt                             0.7.7-r0                         apk                            
-libsodium                                                                1.0.18-r3                        apk           
+libpanelw                              6.4_p20240420-r2                 apk                            
-libsrt                                                                   1.5.2-r0                         apk           
+libpciaccess                           0.18.1-r0                        apk                            
-libssh                                                                   0.10.5-r0                        apk           
+libplacebo                             6.338.2-r1                       apk                            
-libssl3                                                                  3.1.4-r0                         apk           
+libpng                                 1.6.44-r0                        apk                            
-libstdc++                                                                12.2.1_git20220924-r10           apk           
+libpq                                  16.6-r0                          apk                            
-libtasn1                                                                 4.19.0-r1                        apk           
+libproc2                               4.0.4-r0                         apk                            
-libtheora                                                                1.1.1-r17                        apk           
+libpsl                                 0.21.5-r1                        apk                            
-libunibreak                                                              5.1-r0                           apk           
+libpulse                               17.0-r0                          apk                            
-libunistring                                                             1.1-r1                           apk           
+librist                                0.2.10-r1                        apk                            
-libuuid                                                                  2.38.1-r8                        apk           
+libsasl                                2.1.28-r6                        apk                            
-libva                                                                    2.18.0-r1                        apk           
+libsharpyuv                            1.3.2-r0                         apk                            
-libvdpau                                                                 1.5-r1                           apk           
+libsm                                  1.2.4-r4                         apk                            
-libvorbis                                                                1.3.7-r1                         apk           
+libsmbclient                           4.19.9-r0                        apk                            
-libvpx                                                                   1.13.0-r2                        apk           
+libsndfile                             1.2.2-r1                         apk                            
-libwbclient                                                              4.18.8-r0                        apk           
+libsodium                              1.0.19-r0                        apk                            
-libwebp                                                                  1.3.2-r0                         apk           
+libsrt                                 1.5.3-r0                         apk                            
-libx11                                                                   1.8.7-r0                         apk           
+libssh                                 0.10.6-r0                        apk                            
-libxau                                                                   1.0.11-r2                        apk           
+libssl3                                3.3.2-r1                         apk                            
-libxcb                                                                   1.15-r1                          apk           
+libstdc++                              13.2.1_git20240309-r0            apk                            
-libxdmcp                                                                 1.1.4-r2                         apk           
+libtasn1                               4.19.0-r2                        apk                            
-libxext                                                                  1.3.5-r2                         apk           
+libtheora                              1.1.1-r18                        apk                            
-libxfixes                                                                6.0.1-r2                         apk           
+libunibreak                            6.1-r0                           apk                            
-libxft                                                                   2.3.8-r1                         apk           
+libunistring                           1.2-r0                           apk                            
-libxml2                                                                  2.11.4-r0                        apk           
+libuuid                                2.40.1-r1                        apk                            
-libxpm                                                                   3.5.16-r1                        apk           
+libva                                  2.21.0-r0                        apk                            
-libxrender                                                               0.9.11-r3                        apk           
+libvdpau                               1.5-r3                           apk                            
-libxt                                                                    1.3.0-r2                         apk           
+libvorbis                              1.3.7-r2                         apk                            
-libxxhash                                                                0.8.2-r0                         apk           
+libvpx                                 1.14.1-r0                        apk                            
-libzip                                                                   1.9.2-r2                         apk           
+libwbclient                            4.19.9-r0                        apk                            
-libzmq                                                                   4.3.4-r4                         apk           
+libwebp                                1.3.2-r0                         apk                            
-linux-pam                                                                1.5.2-r10                        apk           
+libwebpdemux                           1.3.2-r0                         apk                            
-lmdb                                                                     0.9.31-r0                        apk           
+libwebpmux                             1.3.2-r0                         apk                            
-logrotate                                                                3.21.0-r1                        apk           
+libx11                                 1.8.9-r1                         apk                            
-lz4-libs                                                                 1.9.4-r4                         apk           
+libxau                                 1.0.11-r4                        apk                            
-mbedtls                                                                  2.28.5-r0                        apk           
+libxcb                                 1.16.1-r0                        apk                            
-mexitek/phpcolors                                                        v1.0.4                           php-composer  
+libxdmcp                               1.1.5-r1                         apk                            
-microsoft/azure-storage-blob                                             1.5.4                            php-composer  
+libxext                                1.3.6-r2                         apk                            
-microsoft/azure-storage-common                                           1.5.2                            php-composer  
+libxfixes                              6.0.1-r4                         apk                            
-mlocati/ip-lib                                                           1.18.0                           php-composer  
+libxml2                                2.12.7-r0                        apk                            
-mpg123-libs                                                              1.31.3-r1                        apk           
+libxpm                                 3.5.17-r0                        apk                            
-mtdowling/jmespath.php                                                   2.6.1                            php-composer  
+libxt                                  1.3.0-r5                         apk                            
-musl                                                                     1.2.4-r2                         apk           
+libxxhash                              0.8.2-r2                         apk                            
-musl-utils                                                               1.2.4-r2                         apk           
+libzip                                 1.10.1-r0                        apk                            
-nano                                                                     7.2-r1                           apk           
+libzmq                                 4.3.5-r2                         apk                            
-ncurses-terminfo-base                                                    6.4_p20230506-r0                 apk           
+lilv-libs                              0.24.24-r1                       apk                            
-netcat-openbsd                                                           1.219-r1                         apk           
+linux-pam                              1.6.0-r0                         apk                            
-nettle                                                                   3.8.1-r2                         apk           
+lmdb                                   0.9.32-r0                        apk                            
-nextcloud                                                                1.0.0                            npm           
+logreader                              4.0.0                            npm                            
-nextcloud/lognormalizer                                                  v1.0.0                           php-composer  
+logrotate                              3.21.0-r1                        apk                            
-nghttp2-libs                                                             1.57.0-r0                        apk           
+lz4-libs                               1.9.4-r5                         apk                            
-nginx                                                                    1.24.0-r7                        apk           
+masterminds/html5                      2.9.0                            php-composer                   
-notifications                                                            2.16.0                           npm           
+mbedtls                                3.6.2-r0                         apk                            
-numactl                                                                  2.0.16-r4                        apk           
+mexitek/phpcolors                      v1.0.4                           php-composer                   
-onevpl-libs                                                              2023.2.1-r0                      apk           
+microsoft/azure-storage-blob           1.5.4                            php-composer                   
-oniguruma                                                                6.9.8-r1                         apk           
+microsoft/azure-storage-common         1.5.2                            php-composer                   
-openssl                                                                  3.1.4-r0                         apk           
+mlocati/ip-lib                         1.18.1                           php-composer                   
-opus                                                                     1.4-r0                           apk           
+mpg123-libs                            1.32.8-r0                        apk                            
-orc                                                                      0.4.34-r0                        apk           
+mtdowling/jmespath.php                 2.8.0                            php-composer                   
-p11-kit                                                                  0.24.1-r2                        apk           
+musl                                   1.2.5-r0                         apk                            
-pango                                                                    1.50.14-r1                       apk           
+musl-utils                             1.2.5-r0                         apk                            
-password_policy                                                          1.18.0                           npm           
+nano                                   8.0-r0                           apk                            
-pcre                                                                     8.45-r3                          apk           
+ncurses-terminfo-base                  6.4_p20240420-r2                 apk                            
-pcre2                                                                    10.42-r1                         apk           
+netcat-openbsd                         1.226-r0                         apk                            
-pear/archive_tar                                                         1.4.14                           php-composer  
+netresearch/jsonmapper                 v4.5.0                           php-composer                   
-pear/console_getopt                                                      v1.4.3                           php-composer  
+nettle                                 3.9.1-r0                         apk                            
-pear/pear-core-minimal                                                   v1.10.10                         php-composer  
+nextcloud                              1.0.0                            npm                            
-pear/pear_exception                                                      v1.0.2                           php-composer  
+nextcloud/coding-standard              v1.2.1                           php-composer                   
-photos                                                                   2.4.0                            npm           
+nextcloud/lognormalizer                v1.0.0                           php-composer                   
-php-http/guzzle7-adapter                                                 1.0.0                            php-composer  
+nextcloud/ocp                          dev-master                       php-composer                   
-php-http/httplug                                                         2.2.0                            php-composer  
+nghttp2-libs                           1.62.1-r0                        apk                            
-php-http/promise                                                         1.1.0                            php-composer  
+nginx                                  1.26.2-r0                        apk                            
-php-opencloud/openstack                                                  v3.2.1                           php-composer  
+nikic/php-parser                       v4.19.2                          php-composer                   
-php82                                                                    8.2.12-r0                        apk           
+notifications                          4.0.0                            npm                            
-php82-bcmath                                                             8.2.12-r0                        apk           
+numactl                                2.0.18-r0                        apk                            
-php82-bz2                                                                8.2.12-r0                        apk           
+onevpl-libs                            2023.3.1-r2                      apk                            
-php82-common                                                             8.2.12-r0                        apk           
+oniguruma                              6.9.9-r0                         apk                            
-php82-ctype                                                              8.2.12-r0                        apk           
+openexr-libiex                         3.1.13-r1                        apk                            
-php82-curl                                                               8.2.12-r0                        apk           
+openexr-libilmthread                   3.1.13-r1                        apk                            
-php82-dom                                                                8.2.12-r0                        apk           
+openexr-libopenexr                     3.1.13-r1                        apk                            
-php82-exif                                                               8.2.12-r0                        apk           
+openssl                                3.3.2-r1                         apk                            
-php82-fileinfo                                                           8.2.12-r0                        apk           
+opus                                   1.5.2-r0                         apk                            
-php82-fpm                                                                8.2.12-r0                        apk           
+orc                                    0.4.40-r0                        apk                            
-php82-ftp                                                                8.2.12-r0                        apk           
+p11-kit                                0.25.3-r0                        apk                            
-php82-gd                                                                 8.2.12-r0                        apk           
+paragonie/constant_time_encoding       v2.6.3                           php-composer                   
-php82-gmp                                                                8.2.12-r0                        apk           
+password_policy                        3.0.0                            npm                            
-php82-iconv                                                              8.2.12-r0                        apk           
+pcre                                   8.45-r3                          apk                            
-php82-imap                                                               8.2.12-r0                        apk           
+pcre2                                  10.43-r0                         apk                            
-php82-intl                                                               8.2.12-r0                        apk           
+pear/archive_tar                       1.5.0                            php-composer                   
-php82-ldap                                                               8.2.12-r0                        apk           
+pear/console_getopt                    v1.4.3                           php-composer                   
-php82-mbstring                                                           8.2.12-r0                        apk           
+pear/pear-core-minimal                 v1.10.15                         php-composer                   
-php82-mysqlnd                                                            8.2.12-r0                        apk           
+pear/pear_exception                    v1.0.2                           php-composer                   
-php82-opcache                                                            8.2.12-r0                        apk           
+photos                                 4.0.0                            npm                            
-php82-openssl                                                            8.2.12-r0                        apk           
+php-cs-fixer/shim                      v3.62.0                          php-composer                   
-php82-pcntl                                                              8.2.12-r0                        apk           
+php-http/guzzle7-adapter               1.0.0                            php-composer                   
-php82-pdo                                                                8.2.12-r0                        apk           
+php-http/httplug                       2.2.0                            php-composer                   
-php82-pdo_mysql                                                          8.2.12-r0                        apk           
+php-http/promise                       1.1.0                            php-composer                   
-php82-pdo_pgsql                                                          8.2.12-r0                        apk           
+php-opencloud/openstack                v3.10.0                          php-composer                   
-php82-pdo_sqlite                                                         8.2.12-r0                        apk           
+php83                                  8.3.15-r0                        apk                            
-php82-pecl-apcu                                                          5.1.22-r0                        apk           
+php83-bcmath                           8.3.15-r0                        apk                            
-php82-pecl-igbinary                                                      3.2.14-r0                        apk           
+php83-bz2                              8.3.15-r0                        apk                            
-php82-pecl-imagick                                                       3.7.0-r5                         apk           
+php83-common                           8.3.15-r0                        apk                            
-php82-pecl-mcrypt                                                        1.0.6-r0                         apk           
+php83-ctype                            8.3.15-r0                        apk                            
-php82-pecl-memcached                                                     3.2.0-r1                         apk           
+php83-curl                             8.3.15-r0                        apk                            
-php82-pecl-msgpack                                                       2.2.0-r0                         apk           
+php83-dom                              8.3.15-r0                        apk                            
-php82-pecl-redis                                                         6.0.2-r0                         apk           
+php83-exif                             8.3.15-r0                        apk                            
-php82-pecl-smbclient                                                     1.1.1-r0                         apk           
+php83-fileinfo                         8.3.15-r0                        apk                            
-php82-pgsql                                                              8.2.12-r0                        apk           
+php83-fpm                              8.3.15-r0                        apk                            
-php82-phar                                                               8.2.12-r0                        apk           
+php83-ftp                              8.3.15-r0                        apk                            
-php82-posix                                                              8.2.12-r0                        apk           
+php83-gd                               8.3.15-r0                        apk                            
-php82-session                                                            8.2.12-r0                        apk           
+php83-gmp                              8.3.15-r0                        apk                            
-php82-simplexml                                                          8.2.12-r0                        apk           
+php83-iconv                            8.3.15-r0                        apk                            
-php82-sockets                                                            8.2.12-r0                        apk           
+php83-imap                             8.3.15-r0                        apk                            
-php82-sodium                                                             8.2.12-r0                        apk           
+php83-intl                             8.3.15-r0                        apk                            
-php82-sqlite3                                                            8.2.12-r0                        apk           
+php83-ldap                             8.3.15-r0                        apk                            
-php82-sysvsem                                                            8.2.12-r0                        apk           
+php83-mbstring                         8.3.15-r0                        apk                            
-php82-xml                                                                8.2.12-r0                        apk           
+php83-mysqlnd                          8.3.15-r0                        apk                            
-php82-xmlreader                                                          8.2.12-r0                        apk           
+php83-opcache                          8.3.15-r0                        apk                            
-php82-xmlwriter                                                          8.2.12-r0                        apk           
+php83-openssl                          8.3.15-r0                        apk                            
-php82-zip                                                                8.2.12-r0                        apk           
+php83-pcntl                            8.3.15-r0                        apk                            
-phpseclib/phpseclib                                                      2.0.45                           php-composer  
+php83-pdo                              8.3.15-r0                        apk                            
-pimple/pimple                                                            v3.5.0                           php-composer  
+php83-pdo_mysql                        8.3.15-r0                        apk                            
-pixman                                                                   0.42.2-r1                        apk           
+php83-pdo_pgsql                        8.3.15-r0                        apk                            
-pkgconf                                                                  1.9.5-r0                         apk           
+php83-pdo_sqlite                       8.3.15-r0                        apk                            
-popt                                                                     1.19-r2                          apk           
+php83-pecl-apcu                        5.1.23-r0                        apk                            
-privacy                                                                  1.12.0                           npm           
+php83-pecl-igbinary                    3.2.15-r0                        apk                            
-procps-ng                                                                4.0.4-r0                         apk           
+php83-pecl-imagick                     3.7.0-r0                         apk                            
-psr/cache                                                                3.0.0                            php-composer  
+php83-pecl-mcrypt                      1.0.7-r0                         apk                            
-psr/clock                                                                1.0.0                            php-composer  
+php83-pecl-memcached                   3.3.0-r0                         apk                            
-psr/container                                                            2.0.2                            php-composer  
+php83-pecl-msgpack                     2.2.0-r2                         apk                            
-psr/event-dispatcher                                                     1.0.0                            php-composer  
+php83-pecl-redis                       6.1.0-r0                         apk                            
-psr/http-client                                                          1.0.1                            php-composer  
+php83-pecl-smbclient                   1.1.1-r0                         apk                            
-psr/http-factory                                                         1.0.1                            php-composer  
+php83-pgsql                            8.3.15-r0                        apk                            
-psr/http-message                                                         1.0.1                            php-composer  
+php83-phar                             8.3.15-r0                        apk                            
-psr/log                                                                  1.1.4                            php-composer  
+php83-posix                            8.3.15-r0                        apk                            
-punic/punic                                                              3.8.1                            php-composer  
+php83-session                          8.3.15-r0                        apk                            
-ralouphie/getallheaders                                                  3.0.3                            php-composer  
+php83-simplexml                        8.3.15-r0                        apk                            
-ramsey/collection                                                        1.1.3                            php-composer  
+php83-sockets                          8.3.15-r0                        apk                            
-ramsey/uuid                                                              4.1.1                            php-composer  
+php83-sodium                           8.3.15-r0                        apk                            
-readline                                                                 8.2.1-r1                         apk           
+php83-sqlite3                          8.3.15-r0                        apk                            
-recommendations                                                          2.0.0                            npm           
+php83-sysvsem                          8.3.15-r0                        apk                            
-related_resources                                                        1.3.0                            npm           
+php83-xml                              8.3.15-r0                        apk                            
-rsync                                                                    3.2.7-r4                         apk           
+php83-xmlreader                        8.3.15-r0                        apk                            
-rubix/ml                                                                 dev-chore/bump-flysystem-v2.1.1  php-composer  
+php83-xmlwriter                        8.3.15-r0                        apk                            
-rubix/tensor                                                             2.2.3                            php-composer  
+php83-zip                              8.3.15-r0                        apk                            
-rullzer/easytotp                                                         v0.1.4                           php-composer  
+phpdocumentor/reflection-common        2.2.0                            php-composer                   
-sabre/dav                                                                4.4.0                            php-composer  
+phpdocumentor/reflection-docblock      5.4.1                            php-composer                   
-sabre/event                                                              5.1.4                            php-composer  
+phpdocumentor/type-resolver            1.8.2                            php-composer                   
-sabre/http                                                               5.1.7                            php-composer  
+phpseclib/phpseclib                    2.0.47                           php-composer                   
-sabre/uri                                                                2.3.3                            php-composer  
+phpstan/phpdoc-parser                  1.30.1                           php-composer                   
-sabre/vobject                                                            4.5.3                            php-composer  
+pimple/pimple                          v3.5.0                           php-composer                   
-sabre/xml                                                                2.2.6                            php-composer  
+popt                                   1.19-r3                          apk                            
-samba-client                                                             4.18.8-r0                        apk           
+privacy                                3.0.0                            npm                            
-samba-client-libs                                                        4.18.8-r0                        apk           
+procps-ng                              4.0.4-r0                         apk                            
-samba-common                                                             4.18.8-r0                        apk           
+psr/cache                              3.0.0                            php-composer                   
-samba-libs                                                               4.18.8-r0                        apk           
+psr/clock                              1.0.0                            php-composer  (+1 duplicate)   
-samba-util-libs                                                          4.18.8-r0                        apk           
+psr/container                          2.0.2                            php-composer  (+1 duplicate)   
-scanelf                                                                  1.3.7-r1                         apk           
+psr/event-dispatcher                   1.0.0                            php-composer  (+1 duplicate)   
-scssphp/scssphp                                                          v1.11.0                          php-composer  
+psr/http-client                        1.0.3                            php-composer                   
-sdl2                                                                     2.26.5-r0                        apk           
+psr/http-factory                       1.1.0                            php-composer                   
-shaderc                                                                  2023.3-r1                        apk           
+psr/http-message                       1.1                              php-composer                   
-shadow                                                                   4.13-r4                          apk           
+psr/log                                1.1.4                            php-composer  (+1 duplicate)   
-shared-mime-info                                                         2.2-r5                           apk           
+psr/log                                3.0.2                            php-composer                   
-skalibs                                                                  2.13.1.1-r1                      apk           
+punic/punic                            3.8.1                            php-composer                   
-soxr                                                                     0.1.3-r5                         apk           
+ralouphie/getallheaders                3.0.3                            php-composer                   
-speexdsp                                                                 1.2.1-r1                         apk           
+rav1e-libs                             0.7.1-r0                         apk                            
-spirv-tools                                                              1.3.243.0-r1                     apk           
+readline                               8.2.10-r0                        apk                            
-spomky-labs/base64url                                                    v2.0.4                           php-composer  
+recommendations                        4.0.0                            npm                            
-spomky-labs/cbor-php                                                     v2.0.1                           php-composer  
+related_resources                      2.0.0                            npm                            
-sqlite-libs                                                              3.41.2-r2                        apk           
+rsync                                  3.4.0-r0                         apk                            
-ssl_client                                                               1.36.1-r4                        apk           
+rubix/ml                               dev-chore/bump-flysystem-v2.1.1  php-composer                   
-stecman/symfony-console-completion                                       0.11.0                           php-composer  
+rubix/tensor                           2.2.3                            php-composer                   
-sudo                                                                     1.9.13_p3-r2                     apk           
+rullzer/easytotp                       v0.1.4                           php-composer                   
-suspicious_login                                                         6.0.0-dev                        npm           
+sabre/dav                              4.7.0                            php-composer                   
-svt-av1-libs                                                             1.6.0-r0                         apk           
+sabre/event                            5.1.7                            php-composer                   
-symfony/console                                                          v5.4.24                          php-composer  
+sabre/http                             5.1.12                           php-composer                   
-symfony/css-selector                                                     v5.4.11                          php-composer  
+sabre/uri                              2.3.4                            php-composer                   
-symfony/deprecation-contracts                                            v3.0.2                           php-composer  
+sabre/vobject                          4.5.6                            php-composer                   
-symfony/dom-crawler                                                      v5.4.11                          php-composer  
+sabre/xml                              2.2.11                           php-composer                   
-symfony/event-dispatcher                                                 v5.4.26                          php-composer  
+samba-client                           4.19.9-r0                        apk                            
-symfony/event-dispatcher-contracts                                       v3.0.2                           php-composer  
+samba-client-libs                      4.19.9-r0                        apk                            
-symfony/http-foundation                                                  v5.4.25                          php-composer  
+samba-common                           4.19.9-r0                        apk                            
-symfony/mailer                                                           v5.4.22                          php-composer  
+samba-libs                             4.19.9-r0                        apk                            
-symfony/mime                                                             v5.4.19                          php-composer  
+samba-util-libs                        4.19.9-r0                        apk                            
-symfony/polyfill-ctype                                                   v1.23.0                          php-composer  
+scanelf                                1.3.7-r2                         apk                            
-symfony/polyfill-intl-grapheme                                           v1.23.1                          php-composer  
+scssphp/scssphp                        v1.12.1                          php-composer                   
-symfony/polyfill-intl-idn                                                v1.27.0                          php-composer  
+sdl2                                   2.28.5-r1                        apk                            
-symfony/polyfill-intl-normalizer                                         v1.27.0                          php-composer  
+sebastian/diff                         5.1.1                            php-composer                   
-symfony/polyfill-mbstring                                                v1.27.0                          php-composer  
+serd-libs                              0.32.2-r0                        apk                            
-symfony/polyfill-php72                                                   v1.27.0                          php-composer  
+shaderc                                2024.0-r0                        apk                            
-symfony/polyfill-php73                                                   v1.23.0                          php-composer  
+shadow                                 4.15.1-r0                        apk                            
-symfony/polyfill-php73                                                   v1.26.0                          php-composer  
+skalibs                                2.14.1.1-r0                      apk                            
-symfony/polyfill-php80                                                   v1.27.0                          php-composer  
+sord-libs                              0.16.16-r0                       apk                            
-symfony/process                                                          v5.4.24                          php-composer  
+soxr                                   0.1.3-r7                         apk                            
-symfony/routing                                                          v5.4.25                          php-composer  
+spatie/array-to-xml                    3.3.0                            php-composer                   
-symfony/service-contracts                                                v3.0.2                           php-composer  
+speexdsp                               1.2.1-r2                         apk                            
-symfony/string                                                           v6.0.19                          php-composer  
+spirv-tools                            1.3.261.1-r0                     apk                            
-symfony/translation                                                      v5.4.24                          php-composer  
+spomky-labs/cbor-php                   3.0.4                            php-composer                   
-symfony/translation-contracts                                            v2.4.0                           php-composer  
+spomky-labs/pki-framework              1.2.1                            php-composer                   
-talloc                                                                   2.4.0-r1                         apk           
+sqlite-libs                            3.45.3-r1                        apk                            
-tdb-libs                                                                 1.4.8-r1                         apk           
+sratom                                 0.6.16-r0                        apk                            
-tevent                                                                   0.14.1-r1                        apk           
+ssl_client                             1.36.1-r29                       apk                            
-thecodingmachine/safe                                                    v1.3.3                           php-composer  
+stecman/symfony-console-completion     v0.13.0                          php-composer                   
-tiff                                                                     4.5.1-r0                         apk           
+sudo                                   1.9.15_p5-r0                     apk                            
-twofactor_totp                                                           10.0.0-beta2                     npm           
+support                                3.0.0                            npm                            
-tzdata                                                                   2023c-r1                         apk           
+symfony/console                        v6.4.11                          php-composer                   
-utmps-libs                                                               0.1.2.1-r1                       apk           
+symfony/console                        v6.4.12                          php-composer                   
-v4l-utils-libs                                                           1.24.1-r0                        apk           
+symfony/css-selector                   v6.4.3                           php-composer                   
-vidstab                                                                  1.1.1-r0                         apk           
+symfony/deprecation-contracts          v3.5.0                           php-composer  (+1 duplicate)   
-viewer                                                                   2.2.0                            npm           
+symfony/dom-crawler                    v6.4.4                           php-composer                   
-vulkan-loader                                                            1.3.243.0-r1                     apk           
+symfony/event-dispatcher               v6.4.8                           php-composer                   
-wapmorgan/mp3info                                                        0.1.0                            php-composer  
+symfony/event-dispatcher-contracts     v3.5.0                           php-composer                   
-wayland-libs-client                                                      1.22.0-r2                        apk           
+symfony/filesystem                     v6.4.9                           php-composer                   
-web-auth/cose-lib                                                        v3.3.9                           php-composer  
+symfony/http-foundation                v6.4.12                          php-composer                   
-web-auth/metadata-service                                                v3.3.9                           php-composer  
+symfony/mailer                         v6.4.12                          php-composer                   
-web-auth/webauthn-lib                                                    v3.3.9                           php-composer  
+symfony/mime                           v6.4.12                          php-composer                   
-x264-libs                                                                0.164_git20220602-r1             apk           
+symfony/polyfill-ctype                 v1.31.0                          php-composer  (+1 duplicate)   
-x265-libs                                                                3.5-r4                           apk           
+symfony/polyfill-intl-grapheme         v1.31.0                          php-composer  (+1 duplicate)   
-xvidcore                                                                 1.3.7-r1                         apk           
+symfony/polyfill-intl-idn              v1.31.0                          php-composer                   
-xz-libs                                                                  5.4.3-r0                         apk           
+symfony/polyfill-intl-normalizer       v1.31.0                          php-composer  (+1 duplicate)   
-zimg                                                                     3.0.5-r0                         apk           
+symfony/polyfill-mbstring              v1.31.0                          php-composer  (+2 duplicates)  
-zlib                                                                     1.2.13-r1                        apk           
+symfony/polyfill-php73                 v1.30.0                          php-composer                   
-zstd-libs                                                                1.5.5-r4                         apk           
+symfony/polyfill-php80                 v1.31.0                          php-composer  (+1 duplicate)   
+symfony/polyfill-php83                 v1.31.0                          php-composer                   
+symfony/polyfill-uuid                  v1.29.0                          php-composer                   
+symfony/process                        v6.4.12                          php-composer                   
+symfony/routing                        v6.4.12                          php-composer                   
+symfony/service-contracts              v3.5.0                           php-composer  (+1 duplicate)   
+symfony/string                         v6.4.11                          php-composer                   
+symfony/string                         v6.4.13                          php-composer                   
+symfony/translation                    v6.4.4                           php-composer                   
+symfony/translation-contracts          v3.4.2                           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                   
+vulkan-loader                          1.3.261.1-r0                     apk                            
+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                            

readme-vars.yml

@@ -9,44 +9,25 @@ 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_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-
 # development version
 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*" }
+  - {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: "/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." }
+  - {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" }
+  - {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
-
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -76,57 +57,116 @@ app_setup_block: |
   ```
 
   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: "28.10.23:", desc: "Disable web upgrades using occ during init." }
+  - {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."}
-  - { 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: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
-  - { date: "14.08.23:", desc: "Add develop branch." }
+  - {date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
-  - { 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: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
-  - { date: "21.06.23:", desc: "Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings." }
+  - {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: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
+  - {date: "28.10.23:", desc: "Disable web upgrades using occ during init."}
-  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
+  - {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: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``." }
+  - {date: "14.08.23:", desc: "Add develop branch."}
-  - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
+  - {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: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
+  - {date: "21.06.23:", desc: "Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings."}
-  - { 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: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}
-  - { 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: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
-  - { date: "21.05.22:", desc: "Update version check endpoint." }
+  - {date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``."}
-  - { date: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16." }
+  - {date: "02.03.23:", desc: "Set permissions on crontabs during init."}
-  - { 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: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
-  - { date: "11.09.21:", desc: "Rebasing to alpine 3.14" }
+  - {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: "21.03.21:", desc: "Publish `php8` tag for testing." }
+  - {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: "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.05.22:", desc: "Update version check endpoint."}
-  - { 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: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16."}
-  - { 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: "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: "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: "11.09.21:", desc: "Rebasing to alpine 3.14"}
-  - { 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: "21.03.21:", desc: "Publish `php8` tag for testing."}
-  - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" }
+  - {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: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo" }
+  - {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: "31.05.20:", desc: "Add aliases for occ and updater.phar" }
+  - {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: "31.03.20:", desc: "Allow crontab to be user customized, fix logrotate." }
+  - {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: "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: "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: "19.12.19:", desc: "Rebasing to alpine 3.11." }
+  - {date: "03.06.20:", desc: "Rebasing to alpine 3.12"}
-  - { 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: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo"}
-  - { date: "28.10.19:", desc: "Change cronjob to run every 5 minutes." }
+  - {date: "31.05.20:", desc: "Add aliases for occ and updater.phar"}
-  - { 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: "31.03.20:", desc: "Allow crontab to be user customized, fix logrotate."}
-  - { date: "14.07.19:", desc: "Download nextcloud during build time." }
+  - {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: "28.06.19:", desc: "Rebasing to alpine 3.10." }
+  - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."}
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
+  - {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: "27.02.19:", desc: "Updating base nginx config to sync up with v15 requirements." }
+  - {date: "28.10.19:", desc: "Change cronjob to run every 5 minutes."}
-  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
+  - {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: "28.01.19:", desc: "Add pipeline logic and multi arch." }
+  - {date: "14.07.19:", desc: "Download nextcloud during build time."}
-  - { date: "25.01.19:", desc: "Add php7-phar for occ upgrades." }
+  - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."}
-  - { date: "05.09.18:", desc: "Rebase to alpine 3.8." }
+  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - { date: "11.06.18:", desc: "Use latest rather than specific version for initial install." }
+  - {date: "27.02.19:", desc: "Updating base nginx config to sync up with v15 requirements."}
-  - { date: "26.04.18:", desc: "Bump default install to 13.0.1." }
+  - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
-  - { date: "06.02.18:", desc: "Bump default install to 13.0.0." }
+  - {date: "28.01.19:", desc: "Add pipeline logic and multi arch."}
-  - { date: "26.01.18:", desc: "Rebase to alpine 3.7, bump default install to 12.0.5." }
+  - {date: "25.01.19:", desc: "Add php7-phar for occ upgrades."}
-  - { date: "12.12.17:", desc: "Bump default install to 12.0.4, fix continuation lines." }
+  - {date: "05.09.18:", desc: "Rebase to alpine 3.8."}
-  - { date: "15.10.17:", desc: "Sed php.ini for opcache requirements in newer nextcloud versions." }
+  - {date: "11.06.18:", desc: "Use latest rather than specific version for initial install."}
-  - { date: "20.09.17:", desc: "Bump default install to 12.0.3." }
+  - {date: "26.04.18:", desc: "Bump default install to 13.0.1."}
-  - { date: "19.08.17:", desc: "Bump default install to 12.0.2." }
+  - {date: "06.02.18:", desc: "Bump default install to 13.0.0."}
-  - { date: "25.05.17:", desc: "Rebase to alpine 3.6." }
+  - {date: "26.01.18:", desc: "Rebase to alpine 3.7, bump default install to 12.0.5."}
-  - { date: "22.05.17:", desc: "Update to nextcloud 12.0, adding required dependecies and note about commenting out SAMEORIGIN; line." }
+  - {date: "12.12.17:", desc: "Bump default install to 12.0.4, fix continuation lines."}
-  - { date: "03.05.17:", desc: "Use community repo of memcache." }
+  - {date: "15.10.17:", desc: "Sed php.ini for opcache requirements in newer nextcloud versions."}
-  - { date: "07.03.17:", desc: "Release into main repository and upgrade to php7 and Alpine 3.5." }
+  - {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."}

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,4 +1,4 @@
-## Version 2023/06/23 - 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,9 +9,8 @@ map $arg_v $asset_immutable {
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
-
+    listen 443 ssl default_server;
-    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl default_server;
-    listen [::]:443 ssl http2 default_server;
 
     server_name _;
 
@@ -26,7 +25,7 @@ server {
     # 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 Referrer-Policy                   "no-referrer"       always;
-    add_header X-Content-Type-Options               "nosniff"           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-Frame-Options                      "SAMEORIGIN"        always;
+    add_header X-Permitted-Cross-Domain-Policies "none"              always;
-    add_header X-Permitted-Cross-Domain-Policies    "none"              always;
+    add_header X-Robots-Tag                      "noindex, nofollow" always;
-    add_header X-Robots-Tag                         "noindex, nofollow" always;
+    add_header X-XSS-Protection                  "1; mode=block"     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?$ {

root/etc/crontabs/abc

@@ -0,0 +1,2 @@
+# min   hour    day     month   weekday command
+*/5     *       *       *       *       /usr/bin/php /app/www/public/cron.php 2>&1

root/etc/crontabs/root

@@ -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 /app/www/public/cron.php

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

@@ -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[0-9]* -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /app/www/public/cron.php|" /config/crontabs/root
-# set permissions and import user crontabs
-lsiown root:root /config/crontabs/root
-crontab -u root /config/crontabs/root

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run

@@ -21,7 +21,6 @@ if [ -f /config/www/nextcloud/version.php ]; then
         ! -path "/config/www/nextcloud/config" \
         ! -path "/config/www/nextcloud/themes" \
         -delete
-    sed -i "s|/config/www/nextcloud/cron.php|/app/www/public/cron.php|g" /config/crontabs/root
     touch /config/www/nextcloud/config/needs_migration
 fi
 
@@ -169,3 +168,9 @@ if [ ! -s /config/www/nextcloud/config/config.php ]; then
 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

root/migrations/02-default-location

@@ -5,7 +5,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /config/www/nextcloud/;"
 NEW_ROOT="root /app/www/public;"
 
-if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}"; then
+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