Merge 0aa4543e91 into 7bcd712df4

.github/CONTRIBUTING.md

@@ -105,10 +105,10 @@ docker build \
   -t linuxserver/unifi-network-application:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

.github/workflows/package_trigger_scheduler.yml

@@ -70,14 +70,13 @@ jobs:
           if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
             if [[ -n "${triggered_branches}" ]]; then
               NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-unifi-network-application/activity/ \n"
-              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
             fi
             if [[ -n "${skipped_branches}" ]]; then
               NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
             fi
+            echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
             echo "**** Notifying Discord ****"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Package Check Build(s) for unifi-network-application** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "description": "**Package Check Build(s) Triggered for unifi-network-application** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-unifi-network-application/activity/"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
           fi

Jenkinsfile

@@ -884,7 +884,7 @@ pipeline {
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "main",\
                      "name": "'${META_TAG}'",\
-                     "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
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": false}' >> 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'''

README.md

@@ -148,7 +148,6 @@ The simplest migration approach is to take a full backup of your existing instal
 
 You can then start up the new container with a clean `/config` mount (and a database container configured), and perform a restore using the setup wizard.
 
- 
 ### Strict reverse proxies
 
 This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
@@ -404,10 +403,10 @@ docker build \
   -t lscr.io/linuxserver/unifi-network-application:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

package_versions.txt

@@ -141,7 +141,7 @@ jmdns                                     3.4.1                              jav
 jna                                       5.12.1                             java-archive                  
 joda-time                                 2.12.7                             java-archive                  
 jq                                        1.7.1-3build1                      deb                           
-jrt-fs                                    17.0.13                            java-archive                  
+jrt-fs                                    17.0.12                            java-archive                  
 json                                      20231013                           java-archive                  
 jsr305                                    3.0.1                              java-archive                  
 jsr305                                    3.0.2                              java-archive                  
@@ -258,7 +258,7 @@ mount                                     2.39.3-9ubuntu6.1                  deb
 ncurses-base                              6.4+20240113-1ubuntu2              deb                           
 ncurses-bin                               6.4+20240113-1ubuntu2              deb                           
 netcat-openbsd                            1.226-1ubuntu2                     deb                           
-openjdk-17-jre-headless                   17.0.13+11-2ubuntu1~24.04          deb                           
+openjdk-17-jre-headless                   17.0.12+7-1ubuntu2~24.04           deb                           
 openssh                                   1.0                                java-archive                  
 openssl                                   3.0.13-0ubuntu3.4                  deb                           
 org.eclipse.paho.client.mqttv3            1.1.0                              java-archive