nomad
/
unifi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exec java instead of spawning a child

This commit is contained in:
Daniel Berteaud 2024-01-19 22:49:19 +01:00
parent 3c7ec4e32d
commit e9096a7679
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/images/ubnt-firmware-downloader/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-2
FROM danielberteaud/alpine:24.1-7
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV UBNT_UPDATE_API="https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-firmware&filter=eq~~channel~~release" \

6
example/images/unifi/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/java:17.24.1-1 AS builder
FROM danielberteaud/java:17.24.1-3 AS builder
ARG UNIFI_VERSION=8.0.26
@ -12,7 +12,7 @@ RUN set -euxo pipefail &&\
rm -f UniFi/bin/mongod &&\
chown -R root:root UniFi
FROM danielberteaud/java:17.24.1-1
FROM danielberteaud/java:17.24.1-3
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV JAVA_OPTS="-Djava.awt.headless=true -Dlogback.configurationFile=/opt/unifi/logback.xml --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED" \
@ -37,5 +37,5 @@ USER unifi
VOLUME /data
WORKDIR /opt/unifi
CMD ["sh", "-c", "java ${JAVA_OPTS} -jar /opt/unifi/lib/ace.jar start"]
CMD ["sh", "-c", "exec java ${JAVA_OPTS} -jar /opt/unifi/lib/ace.jar start"]

6
example/unifi.nomad.hcl
View File

@ -56,7 +56,7 @@ job "unifi" {
"traefik.http.routers.unifi-portal.rule=Host(`unifi-portal.example.org`) && PathPrefix(`/guest`)",
"traefik.http.routers.unifi-portal.entrypoints=unifi-portal",
"traefik.http.routers.unifi-portal.tls=true",
"traefik.http.routers.unifi-portal.middlewares=rate-limit-std@file,inflight-std@file,security-headers@file,hsts@file,compression@file,csp-relaxed@file"
"traefik.http.routers.unifi-portal.middlewares=rate-limit-std@file,inflight-std@file,security-headers@file,hsts@file"
]
}
@ -220,17 +220,15 @@ _EOF
driver = "docker"
config {
image = "danielberteaud/unifi:8.0.26-1"
image = "danielberteaud/unifi:8.0.26-2"
volumes = [
"local/init-system.properties.sh:/entrypoint.d/10-init-system.properties.sh"
]
mount {
type = "tmpfs"
target = "/opt/unifi/run"
}
}
vault {

2
images/unifi/Dockerfile
View File

@ -37,5 +37,5 @@ USER unifi
VOLUME /data
WORKDIR /opt/unifi
CMD ["sh", "-c", "java ${JAVA_OPTS} -jar /opt/unifi/lib/ace.jar start"]
CMD ["sh", "-c", "exec java ${JAVA_OPTS} -jar /opt/unifi/lib/ace.jar start"]

2
variables.yml
View File

@ -17,7 +17,7 @@ unifi:
driver: docker
# The image for the controller
image: '[[ .docker.repo ]]unifi:8.0.26-1'
image: '[[ .docker.repo ]]unifi:8.0.26-2'
# Resource allocation for the controller
resources: