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

Commit de05d1f

Browse files
committed
Update deps for 7.5+
1 parent 35538de commit de05d1f

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ ARG DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install packages ****" && \
18+
curl -fsSL https://pgp.mongodb.com/server-4.4.asc | \
19+
gpg -o /usr/share/keyrings/mongodb-server-4.4.gpg \
20+
--dearmor && \
21+
echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
1822
apt-get update && \
1923
apt-get install -y --no-install-recommends \
2024
binutils \
2125
jsvc \
2226
libcap2 \
2327
logrotate \
24-
mongodb-server \
25-
openjdk-11-jre-headless && \
28+
mongodb-org-server \
29+
openjdk-17-jre-headless && \
2630
echo "**** install unifi ****" && \
2731
if [ -z ${UNIFI_VERSION+x} ]; then \
2832
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \

Dockerfile.aarch64

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ ARG DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install packages ****" && \
18+
curl -fsSL https://pgp.mongodb.com/server-4.4.asc | \
19+
gpg -o /usr/share/keyrings/mongodb-server-4.4.gpg \
20+
--dearmor && \
21+
echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
1822
apt-get update && \
1923
apt-get install -y --no-install-recommends \
2024
binutils \
2125
jsvc \
2226
libcap2 \
2327
logrotate \
24-
mongodb-server \
25-
openjdk-11-jre-headless && \
28+
mongodb-org-server \
29+
openjdk-17-jre-headless && \
2630
echo "**** install unifi ****" && \
2731
if [ -z ${UNIFI_VERSION+x} ]; then \
2832
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
@@ -71,6 +71,7 @@ app_setup_block: |
7171
7272
# changelog
7373
changelogs:
74+
- { date: "04.09.23:", desc: "Bump mongodb to 4.4 and JRE to 17 to support v7.5."}
7475
- { date: "02.05.23:", desc: "Cleanup `apt-get install` during build to reduce image size."}
7576
- { date: "18.03.23:", desc: "Add mongoless branch."}
7677
- { 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ 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 -Xmx"${MEM_LIMIT}M" -Dlog4j2.formatMsgNoLookups=true --add-opens=java.base/java.time=ALL-UNNAMED -jar /usr/lib/unifi/lib/ace.jar start;
1212
else
1313
exec \
1414
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;
15+
cd /config s6-setuidgid abc java -Xms"${MEM_STARTUP}M" -Xmx"${MEM_LIMIT}M" -Dlog4j2.formatMsgNoLookups=true --add-opens=java.base/java.time=ALL-UNNAMED -jar /usr/lib/unifi/lib/ace.jar start;
1616
fi

0 commit comments

Comments
 (0)