Merge pull request #219 from linuxserver/7.5

Author: thespad

Dockerfile

@@ -22,7 +22,7 @@ RUN \
     libcap2 \
     logrotate \
     mongodb-server \
-    openjdk-11-jre-headless && \
+    openjdk-17-jre-headless && \
   echo "**** install unifi ****" && \
   if [ -z ${UNIFI_VERSION+x} ]; then \
     UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \

Dockerfile.aarch64

@@ -22,7 +22,7 @@ RUN \
     libcap2 \
     logrotate \
     mongodb-server \
-    openjdk-11-jre-headless && \
+    openjdk-17-jre-headless && \
   echo "**** install unifi ****" && \
   if [ -z ${UNIFI_VERSION+x} ]; then \
     UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \

readme-vars.yml

@@ -71,6 +71,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.09.23:", desc: "Bump JRE to 17 to support v7.5."}
   - { date: "02.05.23:", desc: "Cleanup `apt-get install` during build to reduce image size."}
   - { date: "18.03.23:", desc: "Add mongoless branch."}
   - { date: "10.03.23:", desc: "Test writing to /run/unifi and symlink to /config/run if it fails."}

root/etc/s6-overlay/s6-rc.d/svc-unifi-controller/run

@@ -8,9 +8,38 @@ fi
 if [[ -z ${MEM_STARTUP} ]] || [[ ${MEM_STARTUP} = "default" ]]; then
     exec \
         s6-notifyoncheck -d -n 600 -w 1000 \
-            cd /config s6-setuidgid abc java -Xmx"${MEM_LIMIT}M" -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;
+        cd /config s6-setuidgid abc java \
+            -Xmx"${MEM_LIMIT}M" \
+            -Dlog4j2.formatMsgNoLookups=true \
+            -Dfile.encoding=UTF-8 \
+            -Djava.awt.headless=true \
+            -Dapple.awt.UIElement=true \
+            -XX:+UseParallelGC \
+            -XX:+ExitOnOutOfMemoryError \
+            -XX:+CrashOnOutOfMemoryError \
+            --add-opens java.base/java.lang=ALL-UNNAMED \
+            --add-opens java.base/java.time=ALL-UNNAMED \
+            --add-opens java.base/sun.security.util=ALL-UNNAMED \
+            --add-opens java.base/java.io=ALL-UNNAMED \
+            --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED \
+            -jar /usr/lib/unifi/lib/ace.jar start;
 else
     exec \
         s6-notifyoncheck -d -n 600 -w 1000 \
-            cd /config s6-setuidgid abc java -Xms"${MEM_STARTUP}M" -Xmx"${MEM_LIMIT}M" -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;
+        cd /config s6-setuidgid abc java \
+            -Xms"${MEM_STARTUP}M" \
+            -Xmx"${MEM_LIMIT}M" \
+            -Dlog4j2.formatMsgNoLookups=true \
+            -Dfile.encoding=UTF-8 \
+            -Djava.awt.headless=true \
+            -Dapple.awt.UIElement=true \
+            -XX:+UseParallelGC \
+            -XX:+ExitOnOutOfMemoryError \
+            -XX:+CrashOnOutOfMemoryError \
+            --add-opens java.base/java.lang=ALL-UNNAMED \
+            --add-opens java.base/java.time=ALL-UNNAMED \
+            --add-opens java.base/sun.security.util=ALL-UNNAMED \
+            --add-opens java.base/java.io=ALL-UNNAMED \
+            --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED \
+            -jar /usr/lib/unifi/lib/ace.jar start;
 fi