Bot Updating Templated Files

separate ipv6 listen in default site-conf [develop]

.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/workflows/external_trigger.yml

@@ -11,18 +11,23 @@ jobs:
 
       - 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,9 +36,8 @@ 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 \
@@ -60,45 +64,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

@@ -15,31 +15,31 @@ jobs:
 
       - 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@v4.1.1
-
-      - 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

@@ -14,37 +14,70 @@ jobs:
           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 [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                curl -iX POST \
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                  -H "Accept: application/vnd.github.v3+json" \
+                skipped_branches="${skipped_branches}${br} "
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              elif grep -q "^nextcloud_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                  https://api.github.com/repos/linuxserver/docker-nextcloud/actions/workflows/package_trigger.yml/dispatches
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                sleep 30
+                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') == "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|")
+                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                sleep 10
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                buildurl="${buildurl%$'\r'}"
+                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                curl -iX POST \
+                  "${buildurl}submitDescription" \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                  --data-urlencode "Submit=Submit"
+                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.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -36,6 +36,7 @@ RUN \
     php83-pdo_pgsql \
     php83-pdo_sqlite \
     php83-pecl-imagick \
+    php83-pecl-mcrypt \
     php83-pecl-memcached \
     php83-pecl-smbclient \
     php83-pgsql \
@@ -48,8 +49,6 @@ RUN \
     rsync \
     samba-client \
     sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php83-pecl-mcrypt && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
@@ -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.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -36,6 +36,7 @@ RUN \
     php83-pdo_pgsql \
     php83-pdo_sqlite \
     php83-pecl-imagick \
+    php83-pecl-mcrypt \
     php83-pecl-memcached \
     php83-pecl-smbclient \
     php83-pgsql \
@@ -48,8 +49,6 @@ RUN \
     rsync \
     samba-client \
     sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php83-pecl-mcrypt && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
@@ -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

@@ -17,6 +17,8 @@ pipeline {
     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'
@@ -31,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
@@ -65,7 +81,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.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}" '''
@@ -245,7 +261,7 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.19 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 python3 && \
                     python3 -m venv /lsiopy && \
                     pip install --no-cache-dir -U pip && \
@@ -275,7 +291,7 @@ pipeline {
               # ${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 ghcr.io/linuxserver/jenkins-builder:latest 
+              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
@@ -295,7 +311,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               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}"
@@ -352,7 +368,7 @@ pipeline {
               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}" == "${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
@@ -370,8 +386,8 @@ pipeline {
                 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
@@ -381,7 +397,9 @@ pipeline {
                 echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 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; then
+                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
@@ -474,10 +492,10 @@ 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: ''
       }
@@ -493,6 +511,8 @@ pipeline {
             "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"}' ||: '''
       } 
     }
     /* ###############
@@ -523,6 +543,7 @@ 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=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -554,6 +575,7 @@ 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=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -582,9 +604,10 @@ 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=false --sbom=false \
               --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}"
-            retry(5) {
+            retry_backoff(5,5) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
             sh '''#! /bin/bash
@@ -608,7 +631,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}
@@ -696,18 +719,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}\" \
@@ -717,6 +749,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'''
         }
@@ -740,7 +773,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -758,7 +791,7 @@ pipeline {
                     docker push ${PUSHIMAGE}:${META_TAG}
                     docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
+                      docker push ${PUSHIMAGE}:${SEMVER}
                     fi
                   done
                '''
@@ -781,7 +814,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry(5) {
+          retry_backoff(5,5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -789,7 +822,7 @@ pipeline {
                   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 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
                   for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
@@ -813,35 +846,13 @@ pipeline {
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:develop || :
+                  done
-                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker manifest annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm64v8-develop --os linux --arch arm64 --variant v8
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest create ${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}
-                    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 buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${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
                '''
@@ -866,14 +877,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'''
@@ -998,18 +1009,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} '''
         }
       }
@@ -1027,3 +1073,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.
 
@@ -97,6 +97,7 @@ If you are [using custom app directories](https://docs.nextcloud.com/server/late
 
 Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).
 
+ 
 ### Strict reverse proxies
 
 This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
@@ -290,7 +291,8 @@ Below are the instructions for updating containers:
 
 ### 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
 
@@ -305,16 +307,17 @@ 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
 
+* **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.

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,487 +1,403 @@
 NAME                                 VERSION                          TYPE                         
-@nextcloud/text                      3.10.0                           npm                           
 Process Wrapper                      1.0.0.0                          dotnet        (+1 duplicate)  
-activity                             2.21.0                           npm                           
+activity                             3.0.0                            npm                           
-alpine-baselayout                    3.4.3-r2                         apk                           
+alpine-baselayout                    3.6.5-r0                         apk                           
-alpine-baselayout-data               3.4.3-r2                         apk                           
+alpine-baselayout-data               3.6.5-r0                         apk                           
 alpine-keys                          2.4-r1                           apk                           
-alpine-release                       3.19.1-r0                        apk                           
+alpine-release                       3.20.3-r0                        apk                           
-alsa-lib                             1.2.10-r0                        apk                           
+alsa-lib                             1.2.11-r0                        apk                           
-amphp/amp                            v2.6.2                           php-composer                  
+amphp/amp                            v2.6.4                           php-composer                  
 amphp/byte-stream                    v1.8.1                           php-composer                  
 amphp/parallel                       v1.4.3                           php-composer                  
 amphp/parser                         v1.1.0                           php-composer                  
 amphp/process                        v1.1.4                           php-composer                  
 amphp/serialization                  v1.0.0                           php-composer                  
 amphp/sync                           v1.4.2                           php-composer                  
-anyhow                               1.0.71                           rust-crate                    
+aom-libs                             3.9.1-r0                         apk                           
-anyhow                               1.0.75                           rust-crate                    
+apache2-utils                        2.4.62-r0                        apk                           
-aom-libs                             3.7.1-r0                         apk                           
+apk-tools                            2.14.4-r0                        apk                           
-apache2-utils                        2.4.58-r1                        apk                           
+app_api                              1.0.0                            npm                           
-apk-tools                            2.14.0-r5                        apk                           
+apr                                  1.7.5-r0                         apk                           
-apr                                  1.7.4-r0                         apk                           
 apr-util                             1.6.3-r1                         apk                           
-arg_enum_proc_macro                  0.3.2                            rust-crate                    
 argon2-libs                          20190702-r5                      apk                           
-arrayvec                             0.7.2                            rust-crate                    
+aws/aws-crt-php                      v1.2.5                           php-composer                  
-av-metrics                           0.9.0                            rust-crate                    
+aws/aws-sdk-php                      3.311.2                          php-composer                  
-av1-grain                            0.2.2                            rust-crate                    
-aws/aws-crt-php                      v1.0.2                           php-composer                  
-aws/aws-sdk-php                      3.240.8                          php-composer                  
 bamarni/composer-bin-plugin          1.8.2                            php-composer                  
 bantu/ini-get-wrapper                v1.0.1                           php-composer                  
-bash                                 5.2.21-r0                        apk                           
+bash                                 5.2.26-r0                        apk                           
-beberlei/assert                      v3.3.1                           php-composer                  
+brick/math                           0.12.1                           php-composer                  
-bitflags                             1.3.2                            rust-crate                    
+brotli-libs                          1.1.0-r2                         apk                           
-bitstream-io                         1.6.0                            rust-crate                    
+bruteforcesettings                   3.0.0                            npm                           
-bitstream-io                         1.7.0                            rust-crate                    
+busybox                              1.36.1-r29                       apk                           
-bitvec                               1.0.1                            rust-crate                    
+busybox-binsh                        1.36.1-r29                       apk                           
-bitvec_helpers                       3.1.2                            rust-crate                    
+c-ares                               1.33.1-r0                        apk                           
-brick/math                           0.9.2                            php-composer                  
-brotli-libs                          1.1.0-r1                         apk                           
-bruteforcesettings                   2.9.0                            npm                           
-busybox                              1.36.1-r15                       apk                           
-busybox-binsh                        1.36.1-r15                       apk                           
-c-ares                               1.24.0-r1                        apk                           
 c-client                             2007f-r15                        apk                           
-ca-certificates                      20230506-r0                      apk                           
+ca-certificates                      20240705-r0                      apk                           
-ca-certificates-bundle               20230506-r0                      apk                           
+ca-certificates-bundle               20240705-r0                      apk                           
-cfg-if                               1.0.0                            rust-crate                    
+catatonit                            0.2.0-r0                         apk                           
 christian-riesen/base32              1.6.0                            php-composer                  
-cjson                                1.7.17-r0                        apk                           
+cjson                                1.7.18-r0                        apk                           
-clap                                 4.0.32                           rust-crate                    
+composer                             2.8.1                            binary                        
-clap_complete                        4.0.7                            rust-crate                    
+coreutils                            9.5-r1                           apk                           
-clap_derive                          4.0.21                           rust-crate                    
+coreutils-env                        9.5-r1                           apk                           
-clap_lex                             0.3.0                            rust-crate                    
+coreutils-fmt                        9.5-r1                           apk                           
-composer                             2.7.1                            binary                        
+coreutils-sha512sum                  9.5-r1                           apk                           
-console                              0.15.5                           rust-crate                    
+curl                                 8.9.1-r2                         apk                           
-coreutils                            9.4-r2                           apk                           
-coreutils-env                        9.4-r2                           apk                           
-coreutils-fmt                        9.4-r2                           apk                           
-coreutils-sha512sum                  9.4-r2                           apk                           
-crc                                  3.0.1                            rust-crate                    
-crc-catalog                          2.2.0                            rust-crate                    
-crossbeam                            0.8.2                            rust-crate                    
-crossbeam-channel                    0.5.8                            rust-crate                    
-crossbeam-deque                      0.8.3                            rust-crate                    
-crossbeam-epoch                      0.9.14                           rust-crate                    
-crossbeam-queue                      0.3.8                            rust-crate                    
-crossbeam-utils                      0.8.15                           rust-crate                    
-curl                                 8.5.0-r0                         apk                           
 cweagans/composer-patches            1.7.3                            php-composer                  
-dbus-libs                            1.14.10-r0                       apk                           
+dbus-libs                            1.14.10-r1                       apk                           
-deepdiver/zipstreamer                v2.0.2                           php-composer                  
+deepdiver/zipstreamer                v2.0.3                           php-composer                  
 deepdiver1975/tarstreamer            v2.1.0                           php-composer                  
 doctrine/cache                       2.2.0                            php-composer                  
-doctrine/dbal                        3.7.0                            php-composer                  
+doctrine/dbal                        3.9.1                            php-composer                  
-doctrine/deprecations                1.1.2                            php-composer                  
+doctrine/deprecations                1.1.3                            php-composer                  
-doctrine/event-manager               1.2.0                            php-composer                  
+doctrine/event-manager               2.0.1                            php-composer                  
-doctrine/lexer                       2.1.0                            php-composer                  
+doctrine/lexer                       3.0.1                            php-composer                  
-dolby_vision                         3.2.0                            rust-crate                    
+egulias/email-validator              4.0.2                            php-composer                  
-egulias/email-validator              3.2.6                            php-composer                  
+ffmpeg                               6.1.1-r8                         apk                           
-either                               1.8.1                            rust-crate                    
+ffmpeg-libavcodec                    6.1.1-r8                         apk                           
-fern                                 0.6.2                            rust-crate                    
+ffmpeg-libavdevice                   6.1.1-r8                         apk                           
-ffmpeg                               6.1.1-r0                         apk                           
+ffmpeg-libavfilter                   6.1.1-r8                         apk                           
-ffmpeg-libavcodec                    6.1.1-r0                         apk                           
+ffmpeg-libavformat                   6.1.1-r8                         apk                           
-ffmpeg-libavdevice                   6.1.1-r0                         apk                           
+ffmpeg-libavutil                     6.1.1-r8                         apk                           
-ffmpeg-libavfilter                   6.1.1-r0                         apk                           
+ffmpeg-libpostproc                   6.1.1-r8                         apk                           
-ffmpeg-libavformat                   6.1.1-r0                         apk                           
+ffmpeg-libswresample                 6.1.1-r8                         apk                           
-ffmpeg-libavutil                     6.1.1-r0                         apk                           
+ffmpeg-libswscale                    6.1.1-r8                         apk                           
-ffmpeg-libpostproc                   6.1.1-r0                         apk                           
-ffmpeg-libswresample                 6.1.1-r0                         apk                           
-ffmpeg-libswscale                    6.1.1-r0                         apk                           
 fftw-double-libs                     3.3.10-r5                        apk                           
-fgrosse/phpasn1                      v2.3.0                           php-composer                  
+files_downloadlimit                  3.0.0                            npm                           
-files_downloadlimit                  1.1.0                            npm                           
+files_pdfviewer                      3.0.0                            npm                           
-files_pdfviewer                      2.10.0                           npm                           
+findutils                            4.9.0-r5                         apk                           
-firstrunwizard                       2.18.0                           npm                           
+firstrunwizard                       3.0.0                            npm                           
-fontconfig                           2.14.2-r4                        apk                           
+fontconfig                           2.15.0-r1                        apk                           
 freetype                             2.13.2-r0                        apk                           
-fribidi                              1.0.13-r0                        apk                           
+fribidi                              1.0.15-r0                        apk                           
-funty                                2.0.0                            rust-crate                    
+fusonic/opengraph                    v2.3.0                           php-composer                  
-fusonic/linq                         v1.1.0                           php-composer                  
-fusonic/opengraph                    v2.2.0                           php-composer                  
 gdbm                                 1.23-r1                          apk                           
-getrandom                            0.2.9                            rust-crate                    
+giflib                               5.2.2-r0                         apk                           
-giggsey/libphonenumber-for-php-lite  8.13.27                          php-composer                  
+giggsey/libphonenumber-for-php-lite  8.13.45                          php-composer                  
-git                                  2.43.0-r0                        apk                           
+git                                  2.45.2-r0                        apk                           
-glib                                 2.78.4-r0                        apk                           
+git-init-template                    2.45.2-r0                        apk                           
+glib                                 2.80.5-r0                        apk                           
 glslang-libs                         1.3.261.1-r0                     apk                           
-gmp                                  6.3.0-r0                         apk                           
+gmp                                  6.3.0-r1                         apk                           
 gnu-libiconv                         1.17-r2                          apk                           
 gnu-libiconv-libs                    1.17-r2                          apk                           
-gnutls                               3.8.3-r0                         apk                           
+gnutls                               3.8.5-r0                         apk                           
 graphite2                            1.3.14-r6                        apk                           
-guzzlehttp/guzzle                    7.8.1                            php-composer                  
+guzzlehttp/guzzle                    7.8.2                            php-composer                  
-guzzlehttp/promises                  1.5.3                            php-composer                  
+guzzlehttp/promises                  2.0.4                            php-composer                  
-guzzlehttp/psr7                      2.6.2                            php-composer                  
+guzzlehttp/psr7                      2.7.0                            php-composer                  
-guzzlehttp/uri-template              v0.2.0                           php-composer                  
+guzzlehttp/uri-template              v1.0.3                           php-composer                  
-harfbuzz                             8.3.0-r0                         apk                           
+harfbuzz                             8.5.0-r0                         apk                           
-heck                                 0.4.1                            rust-crate                    
 hexogen/kdtree                       v0.2.5                           php-composer                  
-hiredis                              1.2.0-r0                         apk                           
+hwdata-pci                           0.382-r0                         apk                           
-hwdata-pci                           0.377.2-r0                       apk                           
 icewind/searchdav                    v3.1.0                           php-composer                  
 icewind/smb                          v3.5.4                           php-composer                  
 icewind/streams                      v0.7.7                           php-composer  (+1 duplicate)  
-icu-data-en                          74.1-r0                          apk                           
+icu-data-en                          74.2-r0                          apk                           
-icu-libs                             74.1-r0                          apk                           
+icu-libs                             74.2-r0                          apk                           
-imagemagick                          7.1.1.26-r0                      apk                           
+imagemagick                          7.1.1.32-r2                      apk                           
-imagemagick-jpeg                     7.1.1.26-r0                      apk                           
+imagemagick-jpeg                     7.1.1.32-r2                      apk                           
-imagemagick-jxl                      7.1.1.26-r0                      apk                           
+imagemagick-jxl                      7.1.1.32-r2                      apk                           
-imagemagick-libs                     7.1.1.26-r0                      apk                           
+imagemagick-libs                     7.1.1.32-r2                      apk                           
-imagemagick-webp                     7.1.1.26-r0                      apk                           
+imagemagick-webp                     7.1.1.32-r2                      apk                           
-interpolate_name                     0.2.3                            rust-crate                    
+imath                                3.1.12-r0                        apk                           
-io-lifetimes                         1.0.10                           rust-crate                    
-is-terminal                          0.4.7                            rust-crate                    
-itertools                            0.10.5                           rust-crate                    
-ivf                                  0.1.2                            rust-crate                    
 jansson                              2.14-r4                          apk                           
 jq                                   1.7.1-r0                         apk                           
 justinrainbow/json-schema            v5.2.13                          php-composer                  
 kornrunner/blurhash                  v1.2.2                           php-composer                  
-lab                                  0.11.0                           rust-crate                    
 lame-libs                            3.100-r5                         apk                           
-laravel/serializable-closure         v1.3.3                           php-composer                  
+laravel/serializable-closure         v1.3.5                           php-composer                  
-lazy_static                          1.4.0                            rust-crate                    
+lcms2                                2.16-r0                          apk                           
-lcms2                                2.15-r4                          apk                           
+lcobucci/clock                       3.0.0                            php-composer                  
-ldb                                  2.7.2-r1                         apk                           
+ldb                                  2.8.2-r0                         apk                           
 league/flysystem                     2.5.0                            php-composer                  
 league/mime-type-detection           1.11.0                           php-composer                  
-league/uri                           6.4.0                            php-composer                  
+libSvtAv1Enc                         2.0.0-r1                         apk                           
-league/uri-interfaces                2.2.0                            php-composer                  
+libacl                               2.3.2-r0                         apk                           
-libSvtAv1Enc                         1.7.0-r0                         apk                           
+libarchive                           3.7.7-r0                         apk                           
-libacl                               2.3.1-r4                         apk                           
+libass                               0.17.2-r0                        apk                           
-libarchive                           3.7.2-r0                         apk                           
+libasyncns                           0.8-r3                           apk                           
-libass                               0.17.1-r1                        apk                           
+libattr                              2.5.2-r0                         apk                           
-libasyncns                           0.8-r2                           apk                           
+libauth-samba                        4.19.9-r0                        apk                           
-libattr                              2.5.1-r5                         apk                           
+libavif                              1.0.4-r0                         apk                           
-libavif                              1.0.3-r0                         apk                           
+libblkid                             2.40.1-r1                        apk                           
-libblkid                             2.39.3-r0                        apk                           
 libbluray                            1.3.4-r1                         apk                           
-libbsd                               0.11.7-r3                        apk                           
+libbsd                               0.12.2-r0                        apk                           
 libbz2                               1.0.8-r6                         apk                           
-libc                                 0.2.144                          rust-crate                    
+libcap2                              2.70-r0                          apk                           
-libc                                 0.2.149                          rust-crate                    
+libcrypto3                           3.3.2-r1                         apk                           
-libc-utils                           0.7.2-r5                         apk                           
+libcurl                              8.9.1-r2                         apk                           
-libcap2                              2.69-r1                          apk                           
+libdav1d                             1.4.2-r0                         apk                           
-libcrypto3                           3.1.4-r5                         apk                           
+libdovi                              3.3.0-r0                         apk                           
-libcurl                              8.5.0-r0                         apk                           
+libdrm                               2.4.120-r0                       apk                           
-libdav1d                             1.3.0-r1                         apk                           
+libeconf                             0.6.3-r0                         apk                           
-libdovi                              3.2.0-r1                         apk                           
+libedit                              20240517.3.1-r0                  apk                           
-libdrm                               2.4.118-r0                       apk                           
-libedit                              20230828.3.1-r3                  apk                           
 libevent                             2.1.12-r7                        apk                           
-libexpat                             2.6.0-r0                         apk                           
+libexpat                             2.6.3-r0                         apk                           
-libffi                               3.4.4-r3                         apk                           
+libffi                               3.4.6-r0                         apk                           
 libflac                              1.4.3-r1                         apk                           
-libformw                             6.4_p20231125-r0                 apk                           
+libformw                             6.4_p20240420-r1                 apk                           
-libgcc                               13.2.1_git20231014-r0            apk                           
+libgcc                               13.2.1_git20240309-r0            apk                           
-libgomp                              13.2.1_git20231014-r0            apk                           
+libgomp                              13.2.1_git20240309-r0            apk                           
 libhwy                               1.0.7-r0                         apk                           
-libice                               1.1.1-r5                         apk                           
+libice                               1.1.1-r6                         apk                           
-libidn2                              2.3.4-r4                         apk                           
+libidn2                              2.3.7-r0                         apk                           
-libintl                              0.22.3-r0                        apk                           
+libintl                              0.22.5-r0                        apk                           
-libjpeg-turbo                        3.0.1-r0                         apk                           
+libjpeg-turbo                        3.0.3-r0                         apk                           
-libjxl                               0.8.2-r0                         apk                           
+libjxl                               0.10.2-r0                        apk                           
-libldap                              2.6.6-r1                         apk                           
+libldap                              2.6.8-r0                         apk                           
 libltdl                              2.4.7-r3                         apk                           
 libmcrypt                            2.5.8-r10                        apk                           
 libmd                                1.1.0-r0                         apk                           
 libmemcached-libs                    1.1.4-r1                         apk                           
-libmount                             2.39.3-r0                        apk                           
+libmount                             2.40.1-r1                        apk                           
-libncursesw                          6.4_p20231125-r0                 apk                           
+libncursesw                          6.4_p20240420-r1                 apk                           
 libogg                               1.3.5-r5                         apk                           
-libopenmpt                           0.7.3-r1                         apk                           
+libopenmpt                           0.7.7-r0                         apk                           
-libpanelw                            6.4_p20231125-r0                 apk                           
+libpanelw                            6.4_p20240420-r1                 apk                           
-libpciaccess                         0.17-r2                          apk                           
+libpciaccess                         0.18.1-r0                        apk                           
-libplacebo                           6.338.1-r0                       apk                           
+libplacebo                           6.338.2-r1                       apk                           
-libpng                               1.6.40-r0                        apk                           
+libpng                               1.6.44-r0                        apk                           
-libpq                                16.2-r0                          apk                           
+libpq                                16.4-r0                          apk                           
 libproc2                             4.0.4-r0                         apk                           
-libpulse                             16.1-r11                         apk                           
+libpsl                               0.21.5-r1                        apk                           
-librist                              0.2.10-r0                        apk                           
+libpulse                             17.0-r0                          apk                           
-libsasl                              2.1.28-r5                        apk                           
+librist                              0.2.10-r1                        apk                           
+libsasl                              2.1.28-r6                        apk                           
 libsharpyuv                          1.3.2-r0                         apk                           
-libsm                                1.2.4-r3                         apk                           
+libsm                                1.2.4-r4                         apk                           
-libsmbclient                         4.18.9-r0                        apk                           
+libsmbclient                         4.19.9-r0                        apk                           
 libsndfile                           1.2.2-r0                         apk                           
 libsodium                            1.0.19-r0                        apk                           
 libsrt                               1.5.3-r0                         apk                           
 libssh                               0.10.6-r0                        apk                           
-libssl3                              3.1.4-r5                         apk                           
+libssl3                              3.3.2-r1                         apk                           
-libstdc++                            13.2.1_git20231014-r0            apk                           
+libstdc++                            13.2.1_git20240309-r0            apk                           
 libtasn1                             4.19.0-r2                        apk                           
 libtheora                            1.1.1-r18                        apk                           
-libunibreak                          5.1-r3                           apk                           
+libunibreak                          6.1-r0                           apk                           
-libunistring                         1.1-r2                           apk                           
+libunistring                         1.2-r0                           apk                           
-libuuid                              2.39.3-r0                        apk                           
+libuuid                              2.40.1-r1                        apk                           
-libva                                2.20.0-r0                        apk                           
+libva                                2.21.0-r0                        apk                           
-libvdpau                             1.5-r2                           apk                           
+libvdpau                             1.5-r3                           apk                           
 libvorbis                            1.3.7-r2                         apk                           
-libvpx                               1.13.1-r0                        apk                           
+libvpx                               1.14.1-r0                        apk                           
-libwbclient                          4.18.9-r0                        apk                           
+libwbclient                          4.19.9-r0                        apk                           
 libwebp                              1.3.2-r0                         apk                           
 libwebpdemux                         1.3.2-r0                         apk                           
 libwebpmux                           1.3.2-r0                         apk                           
-libx11                               1.8.7-r0                         apk                           
+libx11                               1.8.9-r1                         apk                           
-libxau                               1.0.11-r3                        apk                           
+libxau                               1.0.11-r4                        apk                           
-libxcb                               1.16-r0                          apk                           
+libxcb                               1.16.1-r0                        apk                           
-libxdmcp                             1.1.4-r3                         apk                           
+libxdmcp                             1.1.5-r1                         apk                           
-libxext                              1.3.5-r3                         apk                           
+libxext                              1.3.6-r2                         apk                           
-libxfixes                            6.0.1-r3                         apk                           
+libxfixes                            6.0.1-r4                         apk                           
-libxml2                              2.11.7-r0                        apk                           
+libxml2                              2.12.7-r0                        apk                           
 libxpm                               3.5.17-r0                        apk                           
-libxt                                1.3.0-r4                         apk                           
+libxt                                1.3.0-r5                         apk                           
 libxxhash                            0.8.2-r2                         apk                           
 libzip                               1.10.1-r0                        apk                           
 libzmq                               4.3.5-r2                         apk                           
-lilv-libs                            0.24.22-r0                       apk                           
+lilv-libs                            0.24.24-r1                       apk                           
-linux-pam                            1.5.3-r7                         apk                           
+linux-pam                            1.6.0-r0                         apk                           
-linux-raw-sys                        0.3.7                            rust-crate                    
+lmdb                                 0.9.32-r0                        apk                           
-lmdb                                 0.9.31-r0                        apk                           
+logreader                            3.0.0                            npm                           
-log                                  0.4.17                           rust-crate                    
-logreader                            2.14.0                           npm                           
 logrotate                            3.21.0-r1                        apk                           
 lz4-libs                             1.9.4-r5                         apk                           
-maybe-rayon                          0.1.1                            rust-crate                    
+masterminds/html5                    2.9.0                            php-composer                  
-mbedtls                              2.28.7-r0                        apk                           
+mbedtls                              3.6.2-r0                         apk                           
-memchr                               2.5.0                            rust-crate                    
-memoffset                            0.8.0                            rust-crate                    
 mexitek/phpcolors                    v1.0.4                           php-composer                  
 microsoft/azure-storage-blob         1.5.4                            php-composer                  
 microsoft/azure-storage-common       1.5.2                            php-composer                  
-minimal-lexical                      0.2.1                            rust-crate                    
 mlocati/ip-lib                       1.18.0                           php-composer                  
-mpg123-libs                          1.32.3-r0                        apk                           
+mpg123-libs                          1.32.8-r0                        apk                           
-mtdowling/jmespath.php               2.6.1                            php-composer                  
+mtdowling/jmespath.php               2.7.0                            php-composer                  
-musl                                 1.2.4_git20230717-r4             apk                           
+musl                                 1.2.5-r0                         apk                           
-musl-utils                           1.2.4_git20230717-r4             apk                           
+musl-utils                           1.2.5-r0                         apk                           
-nano                                 7.2-r1                           apk                           
+nano                                 8.0-r0                           apk                           
-ncurses-terminfo-base                6.4_p20231125-r0                 apk                           
+ncurses-terminfo-base                6.4_p20240420-r1                 apk                           
 netcat-openbsd                       1.226-r0                         apk                           
 nettle                               3.9.1-r0                         apk                           
-new_debug_unreachable                1.0.4                            rust-crate                    
 nextcloud                            1.0.0                            npm                           
+nextcloud/coding-standard            v1.2.1                           php-composer                  
 nextcloud/lognormalizer              v1.0.0                           php-composer                  
-nghttp2-libs                         1.58.0-r0                        apk                           
+nghttp2-libs                         1.62.1-r0                        apk                           
-nginx                                1.24.0-r15                       apk                           
+nginx                                1.26.2-r0                        apk                           
-nom                                  7.1.3                            rust-crate                    
+notifications                        3.0.0                            npm                           
-noop_proc_macro                      0.3.0                            rust-crate                    
+numactl                              2.0.18-r0                        apk                           
-notifications                        2.17.0                           npm                           
-num-bigint                           0.4.3                            rust-crate                    
-num-derive                           0.3.3                            rust-crate                    
-num-integer                          0.1.45                           rust-crate                    
-num-rational                         0.4.1                            rust-crate                    
-num-traits                           0.2.15                           rust-crate                    
-num_cpus                             1.15.0                           rust-crate                    
-numactl                              2.0.16-r4                        apk                           
-once_cell                            1.17.1                           rust-crate                    
 onevpl-libs                          2023.3.1-r2                      apk                           
 oniguruma                            6.9.9-r0                         apk                           
-openssl                              3.1.4-r5                         apk                           
+openexr-libiex                       3.1.13-r1                        apk                           
-opus                                 1.4-r0                           apk                           
+openexr-libilmthread                 3.1.13-r1                        apk                           
-orc                                  0.4.34-r0                        apk                           
+openexr-libopenexr                   3.1.13-r1                        apk                           
-os_str_bytes                         6.5.0                            rust-crate                    
+openssl                              3.3.2-r1                         apk                           
+opus                                 1.5.2-r0                         apk                           
+orc                                  0.4.40-r0                        apk                           
 p11-kit                              0.25.3-r0                        apk                           
-password_policy                      1.19.0                           npm                           
+paragonie/constant_time_encoding     v2.7.0                           php-composer                  
-paste                                1.0.12                           rust-crate                    
+password_policy                      2.0.0                            npm                           
 pcre                                 8.45-r3                          apk                           
-pcre2                                10.42-r2                         apk                           
+pcre2                                10.43-r0                         apk                           
-pear/archive_tar                     1.4.14                           php-composer                  
+pear/archive_tar                     1.5.0                            php-composer                  
 pear/console_getopt                  v1.4.3                           php-composer                  
-pear/pear-core-minimal               v1.10.14                         php-composer                  
+pear/pear-core-minimal               v1.10.15                         php-composer                  
 pear/pear_exception                  v1.0.2                           php-composer                  
-photos                               2.5.0                            npm                           
+photos                               3.0.0                            npm                           
+php-cs-fixer/shim                    v3.61.1                          php-composer                  
 php-http/guzzle7-adapter             1.0.0                            php-composer                  
 php-http/httplug                     2.2.0                            php-composer                  
 php-http/promise                     1.1.0                            php-composer                  
-php-opencloud/openstack              v3.2.1                           php-composer                  
+php-opencloud/openstack              v3.10.0                          php-composer                  
-php83                                8.3.3-r0                         apk                           
+php83                                8.3.13-r0                        apk                           
-php83-bcmath                         8.3.3-r0                         apk                           
+php83-bcmath                         8.3.13-r0                        apk                           
-php83-bz2                            8.3.3-r0                         apk                           
+php83-bz2                            8.3.13-r0                        apk                           
-php83-common                         8.3.3-r0                         apk                           
+php83-common                         8.3.13-r0                        apk                           
-php83-ctype                          8.3.3-r0                         apk                           
+php83-ctype                          8.3.13-r0                        apk                           
-php83-curl                           8.3.3-r0                         apk                           
+php83-curl                           8.3.13-r0                        apk                           
-php83-dom                            8.3.3-r0                         apk                           
+php83-dom                            8.3.13-r0                        apk                           
-php83-exif                           8.3.3-r0                         apk                           
+php83-exif                           8.3.13-r0                        apk                           
-php83-fileinfo                       8.3.3-r0                         apk                           
+php83-fileinfo                       8.3.13-r0                        apk                           
-php83-fpm                            8.3.3-r0                         apk                           
+php83-fpm                            8.3.13-r0                        apk                           
-php83-ftp                            8.3.3-r0                         apk                           
+php83-ftp                            8.3.13-r0                        apk                           
-php83-gd                             8.3.3-r0                         apk                           
+php83-gd                             8.3.13-r0                        apk                           
-php83-gmp                            8.3.3-r0                         apk                           
+php83-gmp                            8.3.13-r0                        apk                           
-php83-iconv                          8.3.3-r0                         apk                           
+php83-iconv                          8.3.13-r0                        apk                           
-php83-imap                           8.3.3-r0                         apk                           
+php83-imap                           8.3.13-r0                        apk                           
-php83-intl                           8.3.3-r0                         apk                           
+php83-intl                           8.3.13-r0                        apk                           
-php83-ldap                           8.3.3-r0                         apk                           
+php83-ldap                           8.3.13-r0                        apk                           
-php83-mbstring                       8.3.3-r0                         apk                           
+php83-mbstring                       8.3.13-r0                        apk                           
-php83-mysqlnd                        8.3.3-r0                         apk                           
+php83-mysqlnd                        8.3.13-r0                        apk                           
-php83-opcache                        8.3.3-r0                         apk                           
+php83-opcache                        8.3.13-r0                        apk                           
-php83-openssl                        8.3.3-r0                         apk                           
+php83-openssl                        8.3.13-r0                        apk                           
-php83-pcntl                          8.3.3-r0                         apk                           
+php83-pcntl                          8.3.13-r0                        apk                           
-php83-pdo                            8.3.3-r0                         apk                           
+php83-pdo                            8.3.13-r0                        apk                           
-php83-pdo_mysql                      8.3.3-r0                         apk                           
+php83-pdo_mysql                      8.3.13-r0                        apk                           
-php83-pdo_pgsql                      8.3.3-r0                         apk                           
+php83-pdo_pgsql                      8.3.13-r0                        apk                           
-php83-pdo_sqlite                     8.3.3-r0                         apk                           
+php83-pdo_sqlite                     8.3.13-r0                        apk                           
 php83-pecl-apcu                      5.1.23-r0                        apk                           
 php83-pecl-igbinary                  3.2.15-r0                        apk                           
 php83-pecl-imagick                   3.7.0-r0                         apk                           
 php83-pecl-mcrypt                    1.0.7-r0                         apk                           
-php83-pecl-memcached                 3.2.0-r0                         apk                           
+php83-pecl-memcached                 3.3.0-r0                         apk                           
-php83-pecl-msgpack                   2.2.0-r1                         apk                           
+php83-pecl-msgpack                   2.2.0-r2                         apk                           
-php83-pecl-redis                     6.0.2-r0                         apk                           
+php83-pecl-redis                     6.1.0-r0                         apk                           
 php83-pecl-smbclient                 1.1.1-r0                         apk                           
-php83-pgsql                          8.3.3-r0                         apk                           
+php83-pgsql                          8.3.13-r0                        apk                           
-php83-phar                           8.3.3-r0                         apk                           
+php83-phar                           8.3.13-r0                        apk                           
-php83-posix                          8.3.3-r0                         apk                           
+php83-posix                          8.3.13-r0                        apk                           
-php83-session                        8.3.3-r0                         apk                           
+php83-session                        8.3.13-r0                        apk                           
-php83-simplexml                      8.3.3-r0                         apk                           
+php83-simplexml                      8.3.13-r0                        apk                           
-php83-sockets                        8.3.3-r0                         apk                           
+php83-sockets                        8.3.13-r0                        apk                           
-php83-sodium                         8.3.3-r0                         apk                           
+php83-sodium                         8.3.13-r0                        apk                           
-php83-sqlite3                        8.3.3-r0                         apk                           
+php83-sqlite3                        8.3.13-r0                        apk                           
-php83-sysvsem                        8.3.3-r0                         apk                           
+php83-sysvsem                        8.3.13-r0                        apk                           
-php83-xml                            8.3.3-r0                         apk                           
+php83-xml                            8.3.13-r0                        apk                           
-php83-xmlreader                      8.3.3-r0                         apk                           
+php83-xmlreader                      8.3.13-r0                        apk                           
-php83-xmlwriter                      8.3.3-r0                         apk                           
+php83-xmlwriter                      8.3.13-r0                        apk                           
-php83-zip                            8.3.3-r0                         apk                           
+php83-zip                            8.3.13-r0                        apk                           
-phpseclib/phpseclib                  2.0.45                           php-composer                  
+phpseclib/phpseclib                  2.0.47                           php-composer                  
 pimple/pimple                        v3.5.0                           php-composer                  
 popt                                 1.19-r3                          apk                           
-ppv-lite86                           0.2.17                           rust-crate                    
+privacy                              2.0.0                            npm                           
-privacy                              1.13.0                           npm                           
-proc-macro-error                     1.0.4                            rust-crate                    
-proc-macro-error-attr                1.0.4                            rust-crate                    
-proc-macro2                          1.0.57                           rust-crate                    
 procps-ng                            4.0.4-r0                         apk                           
 psr/cache                            3.0.0                            php-composer                  
 psr/clock                            1.0.0                            php-composer                  
 psr/container                        2.0.2                            php-composer                  
 psr/event-dispatcher                 1.0.0                            php-composer                  
 psr/http-client                      1.0.3                            php-composer                  
-psr/http-factory                     1.0.2                            php-composer                  
+psr/http-factory                     1.1.0                            php-composer                  
 psr/http-message                     1.1                              php-composer                  
-psr/log                              1.1.4                            php-composer  (+1 duplicate)  
+psr/log                              1.1.4                            php-composer                  
+psr/log                              2.0.0                            php-composer                  
 punic/punic                          3.8.1                            php-composer                  
-quote                                1.0.27                           rust-crate                    
-radium                               0.7.0                            rust-crate                    
 ralouphie/getallheaders              3.0.3                            php-composer                  
-ramsey/collection                    1.1.3                            php-composer                  
+rav1e-libs                           0.7.1-r0                         apk                           
-ramsey/uuid                          4.1.1                            php-composer                  
+readline                             8.2.10-r0                        apk                           
-rand                                 0.8.5                            rust-crate                    
+recommendations                      3.0.0                            npm                           
-rand_chacha                          0.3.1                            rust-crate                    
+related_resources                    1.5.0                            npm                           
-rand_core                            0.6.4                            rust-crate                    
+rsync                                3.3.0-r0                         apk                           
-rav1e                                0.6.6                            rust-crate                    
-rav1e-libs                           0.6.6-r2                         apk                           
-rayon                                1.7.0                            rust-crate                    
-rayon-core                           1.11.0                           rust-crate                    
-readline                             8.2.1-r2                         apk                           
-recommendations                      2.1.0                            npm                           
-related_resources                    1.4.0                            npm                           
-rsync                                3.2.7-r4                         apk                           
 rubix/ml                             dev-chore/bump-flysystem-v2.1.1  php-composer                  
 rubix/tensor                         2.2.3                            php-composer                  
 rullzer/easytotp                     v0.1.4                           php-composer                  
-rust_hawktracer                      0.7.0                            rust-crate                    
+sabre/dav                            4.6.0                            php-composer                  
-rust_hawktracer_normal_macro         0.4.1                            rust-crate                    
-rust_hawktracer_proc_macro           0.4.1                            rust-crate                    
-rustix                               0.37.19                          rust-crate                    
-sabre/dav                            4.5.0                            php-composer                  
 sabre/event                          5.1.4                            php-composer                  
 sabre/http                           5.1.10                           php-composer                  
 sabre/uri                            2.3.3                            php-composer                  
 sabre/vobject                        4.5.4                            php-composer                  
-sabre/xml                            2.2.6                            php-composer                  
+sabre/xml                            2.2.7                            php-composer                  
-samba-client                         4.18.9-r0                        apk                           
+samba-client                         4.19.9-r0                        apk                           
-samba-client-libs                    4.18.9-r0                        apk                           
+samba-client-libs                    4.19.9-r0                        apk                           
-samba-common                         4.18.9-r0                        apk                           
+samba-common                         4.19.9-r0                        apk                           
-samba-libs                           4.18.9-r0                        apk                           
+samba-libs                           4.19.9-r0                        apk                           
-samba-util-libs                      4.18.9-r0                        apk                           
+samba-util-libs                      4.19.9-r0                        apk                           
-scan_fmt                             0.2.6                            rust-crate                    
 scanelf                              1.3.7-r2                         apk                           
-scopeguard                           1.1.0                            rust-crate                    
 scssphp/scssphp                      v1.12.1                          php-composer                  
-sdl2                                 2.28.5-r0                        apk                           
+sdl2                                 2.28.5-r1                        apk                           
-serd-libs                            0.32.0-r0                        apk                           
+serd-libs                            0.32.2-r0                        apk                           
-serde                                1.0.163                          rust-crate                    
+shaderc                              2024.0-r0                        apk                           
-serde_derive                         1.0.163                          rust-crate                    
+shadow                               4.15.1-r0                        apk                           
-shaderc                              2023.7-r0                        apk                           
+skalibs                              2.14.1.1-r0                      apk                           
-shadow                               4.14.2-r0                        apk                           
-signal-hook                          0.3.15                           rust-crate                    
-signal-hook-registry                 1.4.1                            rust-crate                    
-simd_helpers                         0.1.0                            rust-crate                    
-skalibs                              2.14.0.1-r0                      apk                           
 sord-libs                            0.16.16-r0                       apk                           
 soxr                                 0.1.3-r7                         apk                           
 speexdsp                             1.2.1-r2                         apk                           
 spirv-tools                          1.3.261.1-r0                     apk                           
-spomky-labs/base64url                v2.0.4                           php-composer                  
+spomky-labs/cbor-php                 3.1.0                            php-composer                  
-spomky-labs/cbor-php                 v2.0.1                           php-composer                  
+spomky-labs/pki-framework            1.2.1                            php-composer                  
-sqlite-libs                          3.44.2-r0                        apk                           
+sqlite-libs                          3.45.3-r1                        apk                           
 sratom                               0.6.16-r0                        apk                           
-ssl_client                           1.36.1-r15                       apk                           
+ssl_client                           1.36.1-r29                       apk                           
-stecman/symfony-console-completion   0.11.0                           php-composer                  
+stecman/symfony-console-completion   v0.13.0                          php-composer                  
-sudo                                 1.9.15_p2-r0                     apk                           
+sudo                                 1.9.15_p5-r0                     apk                           
-support                              1.12.0                           npm                           
+support                              2.0.0                            npm                           
-suspicious_login                     7.0.0                            npm                           
+suspicious_login                     8.0.0                            npm                           
-symfony/console                      v5.4.35                          php-composer                  
+symfony/console                      v6.4.12                          php-composer                  
-symfony/css-selector                 v5.4.11                          php-composer                  
+symfony/css-selector                 v6.4.3                           php-composer                  
-symfony/deprecation-contracts        v3.0.2                           php-composer                  
+symfony/deprecation-contracts        v3.5.0                           php-composer                  
-symfony/dom-crawler                  v5.4.11                          php-composer                  
+symfony/dom-crawler                  v6.4.4                           php-composer                  
-symfony/event-dispatcher             v5.4.26                          php-composer                  
+symfony/event-dispatcher             v6.4.8                           php-composer                  
 symfony/event-dispatcher-contracts   v3.0.2                           php-composer                  
-symfony/http-foundation              v5.4.25                          php-composer                  
+symfony/http-foundation              v6.4.12                          php-composer                  
-symfony/mailer                       v5.4.22                          php-composer                  
+symfony/mailer                       v6.4.12                          php-composer                  
-symfony/mime                         v5.4.19                          php-composer                  
+symfony/mime                         v6.4.12                          php-composer                  
-symfony/polyfill-ctype               v1.28.0                          php-composer                  
+symfony/polyfill-ctype               v1.29.0                          php-composer                  
-symfony/polyfill-intl-grapheme       v1.28.0                          php-composer                  
+symfony/polyfill-intl-grapheme       v1.31.0                          php-composer                  
-symfony/polyfill-intl-idn            v1.28.0                          php-composer                  
+symfony/polyfill-intl-idn            v1.31.0                          php-composer                  
-symfony/polyfill-intl-normalizer     v1.28.0                          php-composer                  
+symfony/polyfill-intl-normalizer     v1.31.0                          php-composer                  
 symfony/polyfill-mbstring            v1.27.0                          php-composer                  
-symfony/polyfill-mbstring            v1.28.0                          php-composer                  
+symfony/polyfill-mbstring            v1.31.0                          php-composer                  
-symfony/polyfill-php72               v1.28.0                          php-composer                  
 symfony/polyfill-php73               v1.26.0                          php-composer                  
-symfony/polyfill-php73               v1.28.0                          php-composer                  
 symfony/polyfill-php80               v1.27.0                          php-composer                  
-symfony/polyfill-php80               v1.28.0                          php-composer                  
+symfony/polyfill-php80               v1.29.0                          php-composer                  
-symfony/process                      v5.4.34                          php-composer                  
+symfony/polyfill-php83               v1.31.0                          php-composer                  
-symfony/routing                      v5.4.25                          php-composer                  
+symfony/polyfill-uuid                v1.31.0                          php-composer                  
+symfony/process                      v6.4.12                          php-composer                  
+symfony/routing                      v6.4.12                          php-composer                  
 symfony/service-contracts            v3.0.2                           php-composer                  
 symfony/string                       v6.0.19                          php-composer                  
-symfony/translation                  v5.4.24                          php-composer                  
+symfony/translation                  v6.4.12                          php-composer                  
-symfony/translation-contracts        v2.4.0                           php-composer                  
+symfony/translation-contracts        v3.4.2                           php-composer                  
-syn                                  1.0.109                          rust-crate                    
+symfony/uid                          v6.4.12                          php-composer                  
-syn                                  2.0.16                           rust-crate                    
+talloc                               2.4.2-r1                         apk                           
-talloc                               2.4.2-r0                         apk                           
+tdb-libs                             1.4.9-r1                         apk                           
-tap                                  1.0.1                            rust-crate                    
+tevent                               0.16.1-r0                        apk                           
-tdb-libs                             1.4.9-r0                         apk                           
+text                                 4.0.0                            npm                           
-termcolor                            1.2.0                            rust-crate                    
+twofactor_nextcloud_notification     4.0.0                            npm                           
-terminal_size                        0.2.6                            rust-crate                    
+twofactor_totp                       12.0.0-dev                       npm                           
-tevent                               0.15.0-r0                        apk                           
+tzdata                               2024b-r0                         apk                           
-thecodingmachine/safe                v1.3.3                           php-composer                  
+utmps-libs                           0.1.2.2-r1                       apk                           
-thiserror                            1.0.40                           rust-crate                    
-thiserror-impl                       1.0.40                           rust-crate                    
-twofactor_totp                       11.0.0-dev                       npm                           
-tzdata                               2024a-r0                         apk                           
-unicode-ident                        1.0.8                            rust-crate                    
-unicode-width                        0.1.10                           rust-crate                    
-utmps-libs                           0.1.2.2-r0                       apk                           
 v4l-utils-libs                       1.24.1-r1                        apk                           
-v_frame                              0.3.3                            rust-crate                    
 vidstab                              1.1.1-r0                         apk                           
-viewer                               2.3.0                            npm                           
+viewer                               3.0.0                            npm                           
 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                    v3.3.9                           php-composer                  
+web-auth/cose-lib                    4.4.0                            php-composer                  
-web-auth/metadata-service            v3.3.9                           php-composer                  
+web-auth/webauthn-lib                4.9.1                            php-composer                  
-web-auth/webauthn-lib                v3.3.9                           php-composer                  
-wyz                                  0.5.1                            rust-crate                    
 x264-libs                            0.164_git20231001-r0             apk                           
-x265-libs                            3.5-r4                           apk                           
+x265-libs                            3.6-r0                           apk                           
 xvidcore                             1.3.7-r2                         apk                           
-xz-libs                              5.4.5-r0                         apk                           
+xz-libs                              5.6.2-r0                         apk                           
-y4m                                  0.8.0                            rust-crate                    
 zimg                                 3.0.5-r2                         apk                           
 zix-libs                             0.4.2-r0                         apk                           
-zlib                                 1.3.1-r0                         apk                           
+zlib                                 1.3.1-r1                         apk                           
-zstd-libs                            1.5.5-r8                         apk                           
+zstd-libs                            1.5.6-r0                         apk                           

readme-vars.yml

@@ -9,7 +9,6 @@ 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:
@@ -25,10 +24,6 @@ development_versions_items:
 # 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/{{ project_name }}/config", desc: "Persistent config files" }
@@ -36,16 +31,6 @@ param_volumes:
 param_usage_include_ports: true
 param_ports:
   - { external_port: "443", internal_port: "443", port_desc: "WebUI" }
-param_device_map: false
-cap_add_param: false
-
-# optional container parameters
-opt_param_usage_include_env: false
-opt_param_usage_include_vols: false
-opt_param_usage_include_ports: false
-opt_param_device_map: false
-opt_cap_add_param: false
-optional_block_1: false
 
 # application setup block
 app_setup_block_enabled: true
@@ -79,6 +64,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
   - { date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
   - { date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types." }

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

@@ -1,4 +1,4 @@
-## Version 2024/01/03 - 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 _;