From f1ea91d30dbce1569daf69bae89ace4f8dbc23f7 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 16 Nov 2023 09:08:59 +0000 Subject: [PATCH 1/4] Initial build --- Dockerfile | 22 +++++++------------ Dockerfile.aarch64 | 22 +++++++------------ .../init-unifi-network-application-config/run | 8 +++++++ 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1128e08..c012314 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label ARG BUILD_DATE @@ -11,17 +11,13 @@ LABEL maintainer="thespad" # environment settings ARG UNIFI_BRANCH="stable" -ARG DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - binutils \ + apk add --no-cache \ jsvc \ - libcap2 \ logrotate \ - openjdk-17-jre-headless && \ + openjdk17-jre-headless && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ @@ -31,15 +27,13 @@ RUN \ fi && \ mkdir -p /app && \ curl -o \ - /tmp/unifi.deb -L \ - "https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \ - dpkg -i --ignore-depends=mongodb-org-server /tmp/unifi.deb && \ + /tmp/unifi.zip -L \ + "https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \ + unzip /tmp/unifi.zip -d /usr/lib && \ + mv /usr/lib/UniFi /usr/lib/unifi && \ echo "**** cleanup ****" && \ - apt-get clean && \ rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d88768d..a2f2b12 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label ARG BUILD_DATE @@ -11,17 +11,13 @@ LABEL maintainer="thespad" # environment settings ARG UNIFI_BRANCH="stable" -ARG DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - binutils \ + apk add --no-cache \ jsvc \ - libcap2 \ logrotate \ - openjdk-17-jre-headless && \ + openjdk17-jre-headless && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ @@ -31,15 +27,13 @@ RUN \ fi && \ mkdir -p /app && \ curl -o \ - /tmp/unifi.deb -L \ - "https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \ - dpkg -i --ignore-depends=mongodb-org-server /tmp/unifi.deb && \ + /tmp/unifi.zip -L \ + "https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \ + unzip /tmp/unifi.zip -d /usr/lib && \ + mv /usr/lib/UniFi /usr/lib/unifi && \ echo "**** cleanup ****" && \ - apt-get clean && \ rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* # add local files COPY root/ / diff --git a/root/etc/s6-overlay/s6-rc.d/init-unifi-network-application-config/run b/root/etc/s6-overlay/s6-rc.d/init-unifi-network-application-config/run index 0bc932e..d526dab 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-unifi-network-application-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-unifi-network-application-config/run @@ -3,6 +3,7 @@ # create our folders mkdir -p \ + /run/unifi/work/ROOT \ /config/{data,logs} # create symlinks for config @@ -19,6 +20,13 @@ for i in "${symlinks[@]}"; do fi done +if [[ -L "/usr/lib/unifi/run" && ! "/usr/lib/unifi/run" -ef "/run/unifi" ]]; then + unlink "/usr/lib/unifi/run" +fi +if [[ ! -L "/usr/lib/unifi/run" ]]; then + ln -s "/run/unifi" "/usr/lib/unifi/run" +fi + if [[ ! -e /config/data/system.properties ]]; then if [[ -z "${MONGO_HOST}" ]]; then echo "*** No MONGO_HOST set, cannot configure database settings. ***" From 56dfd10866ca56f7886bfe3851fc2234425b1e4c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 21 Nov 2023 19:58:00 +0000 Subject: [PATCH 2/4] jammy actually --- Dockerfile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c012314..3e8e069 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -10,14 +10,17 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" # environment settings -ARG UNIFI_BRANCH="stable" +ARG UNIFI_BRANCH="stable" \ +DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ - apk add --no-cache \ + apt-get update && \ + apt-get install --no-install-recommends -y \ jsvc \ logrotate \ - openjdk17-jre-headless && \ + openjdk-17-jre-headless \ + unzip && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ @@ -32,8 +35,11 @@ RUN \ unzip /tmp/unifi.zip -d /usr/lib && \ mv /usr/lib/UniFi /usr/lib/unifi && \ echo "**** cleanup ****" && \ + apt-get clean && \ rm -rf \ - /tmp/* + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY root/ / From 2f61d5d2282e28c6ba6b956e21504e4588b67bae Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 16 Jan 2024 15:16:36 +0000 Subject: [PATCH 3/4] Update arm dockerfile and readme --- Dockerfile.aarch64 | 16 +++++++++++----- readme-vars.yml | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a2f2b12..93d023b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -10,14 +10,17 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" # environment settings -ARG UNIFI_BRANCH="stable" +ARG UNIFI_BRANCH="stable" \ +DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ - apk add --no-cache \ + apt-get update && \ + apt-get install --no-install-recommends -y \ jsvc \ logrotate \ - openjdk17-jre-headless && \ + openjdk-17-jre-headless \ + unzip && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ @@ -32,8 +35,11 @@ RUN \ unzip /tmp/unifi.zip -d /usr/lib && \ mv /usr/lib/UniFi /usr/lib/unifi && \ echo "**** cleanup ****" && \ + apt-get clean && \ rm -rf \ - /tmp/* + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY root/ / diff --git a/readme-vars.yml b/readme-vars.yml index d06c832..c975f6a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -121,5 +121,6 @@ app_setup_block: | # changelog changelogs: + - { date: "16.01.24:", desc: "Install from zip package instead of deb." } - { date: "17.10.23:", desc: "Add environment variables for TLS and authSource to support Atlas and new MongoDB versions." } - { date: "05.09.23:", desc: "Initial release." } From 7e4ee7dba7c4ad4d7415256384e9c5799f4c605e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 4 Feb 2024 16:05:38 +0000 Subject: [PATCH 4/4] Update release date --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index c975f6a..d1502f6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -121,6 +121,6 @@ app_setup_block: | # changelog changelogs: - - { date: "16.01.24:", desc: "Install from zip package instead of deb." } + - { date: "04.03.24:", desc: "Install from zip package instead of deb." } - { date: "17.10.23:", desc: "Add environment variables for TLS and authSource to support Atlas and new MongoDB versions." } - { date: "05.09.23:", desc: "Initial release." }