Merge pull request #194 from linuxserver/s6v3

Author: thespad

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal-da661a62-ls106
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
@@ -33,8 +33,9 @@ RUN \
   fi && \
   mkdir -p /app && \
   curl -o \
-  /app/unifi.deb -L \
+  /tmp/unifi.deb -L \
     "https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
+  dpkg -i /tmp/unifi.deb && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal-da661a62-ls106
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -33,8 +33,9 @@ RUN \
   fi && \
   mkdir -p /app && \
   curl -o \
-  /app/unifi.deb -L \
+  /tmp/unifi.deb -L \
     "https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
+  dpkg -i /tmp/unifi.deb && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \

README.md

@@ -100,7 +100,7 @@ services:
       - MEM_LIMIT=1024 #optional
       - MEM_STARTUP=1024 #optional
     volumes:
-      - <path to data>:/config
+      - /path/to/data:/config
     ports:
       - 8443:8443
       - 3478:3478/udp
@@ -133,7 +133,7 @@ docker run -d \
   -p 8880:8880 `#optional` \
   -p 6789:6789 `#optional` \
   -p 5514:5514/udp `#optional` \
-  -v <path to data>:/config \
+  -v /path/to/data:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/unifi-controller:latest
 
@@ -270,6 +270,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.02.23:** - Migrate to s6v3, install deb package on build, fix permissions.
 * **23.01.23:** - Exclude `run` from `/config` volume.
 * **30.11.22:** - Bump JRE to 11.
 * **01.06.22:** - Deprecate armhf.

readme-vars.yml

@@ -19,7 +19,7 @@ development_versions: false
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "<path to data>", desc: "All Unifi data stored here" }
+  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "All Unifi data stored here" }
 
 param_usage_include_ports: true
 param_ports:
@@ -66,6 +66,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.02.23:", desc: "Migrate to s6v3, install deb package on build, fix permissions."}
   - { date: "23.01.23:", desc: "Exclude `run` from `/config` volume."}
   - { date: "30.11.22:", desc: "Bump JRE to 11."}
   - { date: "01.06.22:", desc: "Deprecate armhf."}

root/etc/cont-init.d/15-install

@@ -1,89 +1,90 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # create our folders
 mkdir -p \
     /config/{data,logs}
 
-
 # create symlinks for config
 symlinks=( \
 /usr/lib/unifi/data \
 /usr/lib/unifi/logs )
 
-for i in "${symlinks[@]}"
-do
-[[ -L "$i" && ! "$i" -ef /config/"$(basename "$i")"  ]] && unlink "$i"
-[[ ! -L "$i" ]] && ln -s /config/"$(basename "$i")" "$i"
+for i in "${symlinks[@]}"; do
+    if [[ -L "$i" && ! "$i" -ef /config/"$(basename "$i")"  ]]; then
+        unlink "$i"
+    fi
+    if [[ ! -L "$i" ]]; then
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
 done
 
 if [[ ! -e /config/data/system.properties ]]; then
     cp /defaults/system.properties /config/data
 fi
 
+# Configure memory limits
 if grep -q "xmx" /config/data/system.properties && grep -q "xms" /config/data/system.properties; then
-
     if [[ $MEM_LIMIT == "default" ]]; then
         echo "*** Setting Java memory limit to default ***"
         sed -i "/unifi.xmx=.*/d" /config/data/system.properties
     elif [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
         sed -i "s/unifi.xmx=.*/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
     fi
-
     if [[ $MEM_STARTUP == "default" ]]; then
         echo "*** Setting Java memory minimum to default ***"
         sed -i "/unifi.xms=.*/d" /config/data/system.properties
     elif [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         sed -i "s/unifi.xms=.*/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
     fi
-
 elif grep -q "xmx" /config/data/system.properties; then
-
     if [[ $MEM_LIMIT == "default" ]]; then
         echo "*** Setting Java memory limit to default ***"
         sed -i "/unifi.xmx=.*/d" /config/data/system.properties
     elif [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
         sed -i "s/unifi.xmx=.*/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties
     fi
-
     if [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
     fi
-
 elif grep -q "xms" /config/data/system.properties; then
-
     if [[ $MEM_STARTUP == "default" ]]; then
         echo "*** Setting Java memory minimum to default ***"
         sed -i "/unifi.xms=.*/d" /config/data/system.properties
     elif [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         sed -i "s/unifi.xms=.*/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
     fi
-
     if [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
         echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
     fi
-
 else
-
     if [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
         echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
     fi
-
     if [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
     fi
+fi
 
+# generate key
+if [[ ! -f /config/data/keystore ]]; then
+    keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
+    -storepass aircontrolenterprise -keypass aircontrolenterprise -validity 3650 \
+    -keysize 4096 -dname "cn=unifi"
 fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
 	/config \
-	/usr/lib/unifi \
 	/run/unifi
+
+lsiown abc:abc \
+    /config/data/keystore

root/etc/cont-init.d/30-keygen

@@ -0,0 +1 @@
+oneshot