Skip to content
This repository was archived by the owner on Jan 7, 2024. It is now read-only.

Commit 31723dd

Browse files
authored
Merge pull request #220 from linuxserver/mongoless-7.5
2 parents b51c821 + 2d102b0 commit 31723dd

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN \
2121
jsvc \
2222
libcap2 \
2323
logrotate \
24-
openjdk-11-jre-headless && \
24+
openjdk-17-jre-headless && \
2525
echo "**** install unifi ****" && \
2626
if [ -z ${UNIFI_VERSION+x} ]; then \
2727
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN \
2121
jsvc \
2222
libcap2 \
2323
logrotate \
24-
openjdk-11-jre-headless && \
24+
openjdk-17-jre-headless && \
2525
echo "**** install unifi ****" && \
2626
if [ -z ${UNIFI_VERSION+x} ]; then \
2727
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ app_setup_block: |
8989
9090
# changelog
9191
changelogs:
92+
- { date: "04.09.23:", desc: "Bump JRE to 17 to support v7.5."}
9293
- { date: "04.05.23:", desc: "Cleanup `apt-get install` during build to reduce image size."}
9394
- { date: "18.03.23:", desc: "Add mongoless branch."}
9495
- { date: "20.02.23:", desc: "Migrate to s6v3, install deb package on build, fix permissions."}

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

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,38 @@ fi
88
if [[ -z ${MEM_STARTUP} ]] || [[ ${MEM_STARTUP} = "default" ]]; then
99
exec \
1010
s6-notifyoncheck -d -n 600 -w 1000 \
11-
cd /config s6-setuidgid abc java -Xmx"${MEM_LIMIT}M" -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;
11+
cd /config s6-setuidgid abc java \
12+
-Xmx"${MEM_LIMIT}M" \
13+
-Dlog4j2.formatMsgNoLookups=true \
14+
-Dfile.encoding=UTF-8 \
15+
-Djava.awt.headless=true \
16+
-Dapple.awt.UIElement=true \
17+
-XX:+UseParallelGC \
18+
-XX:+ExitOnOutOfMemoryError \
19+
-XX:+CrashOnOutOfMemoryError \
20+
--add-opens java.base/java.lang=ALL-UNNAMED \
21+
--add-opens java.base/java.time=ALL-UNNAMED \
22+
--add-opens java.base/sun.security.util=ALL-UNNAMED \
23+
--add-opens java.base/java.io=ALL-UNNAMED \
24+
--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED \
25+
-jar /usr/lib/unifi/lib/ace.jar start;
1226
else
1327
exec \
1428
s6-notifyoncheck -d -n 600 -w 1000 \
15-
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;
29+
cd /config s6-setuidgid abc java \
30+
-Xms"${MEM_STARTUP}M" \
31+
-Xmx"${MEM_LIMIT}M" \
32+
-Dlog4j2.formatMsgNoLookups=true \
33+
-Dfile.encoding=UTF-8 \
34+
-Djava.awt.headless=true \
35+
-Dapple.awt.UIElement=true \
36+
-XX:+UseParallelGC \
37+
-XX:+ExitOnOutOfMemoryError \
38+
-XX:+CrashOnOutOfMemoryError \
39+
--add-opens java.base/java.lang=ALL-UNNAMED \
40+
--add-opens java.base/java.time=ALL-UNNAMED \
41+
--add-opens java.base/sun.security.util=ALL-UNNAMED \
42+
--add-opens java.base/java.io=ALL-UNNAMED \
43+
--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED \
44+
-jar /usr/lib/unifi/lib/ace.jar start;
1645
fi

0 commit comments

Comments
 (0)