From e02116cb24dddf455b7e2cfcbbffe5dfe82f66d5 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 2 May 2024 15:06:17 +0200 Subject: [PATCH] Update to 8.1.127 --- example/images/ubnt-firmware-downloader/Dockerfile | 2 +- example/images/unifi/Dockerfile | 14 +++++++------- example/unifi.nomad.hcl | 6 +++--- images/unifi/Dockerfile | 8 ++++---- variables.yml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/images/ubnt-firmware-downloader/Dockerfile b/example/images/ubnt-firmware-downloader/Dockerfile index ab6e9e2..aff2690 100644 --- a/example/images/ubnt-firmware-downloader/Dockerfile +++ b/example/images/ubnt-firmware-downloader/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alpine:24.4-1 +FROM danielberteaud/alpine:24.5-1 MAINTAINER Daniel Berteaud ENV UBNT_UPDATE_API="https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-firmware&filter=eq~~channel~~release" \ diff --git a/example/images/unifi/Dockerfile b/example/images/unifi/Dockerfile index 7597192..d4e25bf 100644 --- a/example/images/unifi/Dockerfile +++ b/example/images/unifi/Dockerfile @@ -1,18 +1,18 @@ -FROM danielberteaud/java:17.24.4-1 AS builder +FROM danielberteaud/java:17.24.5-1 AS builder -ARG UNIFI_VERSION=8.1.113 +ARG UNIFI_VERSION=8.1.127 +ADD https://www.ubnt.com/downloads/unifi/${UNIFI_VERSION}/UniFi.unix.zip /tmp RUN set -euxo pipefail &&\ - apk --no-cache add curl ca-certificates unzip &&\ + apk --no-cache add unzip &&\ cd /tmp &&\ - curl -sSLO https://www.ubnt.com/downloads/unifi/${UNIFI_VERSION}/UniFi.unix.zip &&\ unzip UniFi.unix.zip &&\ rm -f UniFi.unix.zip &&\ ls -l &&\ rm -f UniFi/bin/mongod &&\ chown -R root:root UniFi -FROM danielberteaud/java:17.24.4-1 +FROM danielberteaud/java:17.24.5-1 MAINTAINER Daniel Berteaud 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" \ @@ -20,9 +20,7 @@ ENV JAVA_OPTS="-Djava.awt.headless=true -Dlogback.configurationFile=/opt/unifi/l LANG=fr_FR.utf8 COPY --from=builder /tmp/UniFi /opt/unifi -COPY root/ / RUN set -euxo pipefail &&\ - apk --no-cache upgrade &&\ addgroup -g 8443 unifi &&\ adduser --system --ingroup unifi --disabled-password --uid 8443 --home /opt/unifi --shell /sbin/nologin unifi &&\ mkdir -p /data/unifi &&\ @@ -32,6 +30,8 @@ RUN set -euxo pipefail &&\ ln -s /data/unifi /opt/unifi/data &&\ ln -s /data/logs /opt/unifi/logs +COPY root/ / + EXPOSE 8443 8080 8843 3778 USER unifi VOLUME /data diff --git a/example/unifi.nomad.hcl b/example/unifi.nomad.hcl index 30ac864..75cff32 100644 --- a/example/unifi.nomad.hcl +++ b/example/unifi.nomad.hcl @@ -168,7 +168,7 @@ job "unifi" { user = 1053 config { - image = "danielberteaud/wait-for:24.4-1" + image = "danielberteaud/wait-for:24.5-1" readonly_rootfs = true pids_limit = 20 } @@ -287,7 +287,7 @@ _EOF driver = "docker" config { - image = "danielberteaud/unifi:8.1.113-1" + image = "danielberteaud/unifi:8.1.127-1" volumes = [ "local/init-system.properties.sh:/entrypoint.d/10-init-system.properties.sh" ] @@ -419,7 +419,7 @@ _EOF } config { - image = "danielberteaud/mongo:5.0.24.4-1" + image = "danielberteaud/mongo:5.0.24.5-1" command = "mongod" readonly_rootfs = true pids_limit = 200 diff --git a/images/unifi/Dockerfile b/images/unifi/Dockerfile index e41b758..8125725 100644 --- a/images/unifi/Dockerfile +++ b/images/unifi/Dockerfile @@ -2,10 +2,10 @@ FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]] AS builder ARG UNIFI_VERSION=[[ .unifi.controller.version ]] +ADD https://www.ubnt.com/downloads/unifi/${UNIFI_VERSION}/UniFi.unix.zip /tmp RUN set -euxo pipefail &&\ - apk --no-cache add curl ca-certificates unzip &&\ + apk --no-cache add unzip &&\ cd /tmp &&\ - curl -sSLO https://www.ubnt.com/downloads/unifi/${UNIFI_VERSION}/UniFi.unix.zip &&\ unzip UniFi.unix.zip &&\ rm -f UniFi.unix.zip &&\ ls -l &&\ @@ -20,9 +20,7 @@ ENV JAVA_OPTS="-Djava.awt.headless=true -Dlogback.configurationFile=/opt/unifi/l LANG=[[ .locale.lang ]] COPY --from=builder /tmp/UniFi /opt/unifi -COPY root/ / RUN set -euxo pipefail &&\ - apk --no-cache upgrade &&\ addgroup -g 8443 unifi &&\ adduser --system --ingroup unifi --disabled-password --uid 8443 --home /opt/unifi --shell /sbin/nologin unifi &&\ mkdir -p /data/unifi &&\ @@ -32,6 +30,8 @@ RUN set -euxo pipefail &&\ ln -s /data/unifi /opt/unifi/data &&\ ln -s /data/logs /opt/unifi/logs +COPY root/ / + EXPOSE 8443 8080 8843 3778 USER unifi VOLUME /data diff --git a/variables.yml b/variables.yml index a1b94ac..df23479 100644 --- a/variables.yml +++ b/variables.yml @@ -18,7 +18,7 @@ unifi: driver: docker # Version of the controller to deploy - version: 8.1.113 + version: 8.1.127 # The image for the controller image: '[[ .docker.repo ]]unifi:[[ .unifi.controller.version ]]-1'