Merge pull request #19 from linuxserver-labs/s6v3

Dockerfile

@@ -14,8 +14,6 @@ RUN \
   echo "**** install packages ****" && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
-    bash \
-    curl \
     gnupg \
     jsvc \
     libcap2 \

README.md

@@ -239,6 +239,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.03.23:** - Migrate to s6v3
 * **12.01.22:** - Switch to MongoDB 4.4
 * **29.09.21:** - Documentation updates
 * **13.08.21:** - Initial Release

root/etc/s6-overlay/s6-rc.d/init-adduser/branding

@@ -0,0 +1,15 @@
+───────────────────────────────────────
+
+      ██╗     ███████╗██╗ ██████╗ 
+      ██║     ██╔════╝██║██╔═══██╗
+      ██║     ███████╗██║██║   ██║
+      ██║     ╚════██║██║██║   ██║
+      ███████╗███████║██║╚██████╔╝
+      ╚══════╝╚══════╝╚═╝ ╚═════╝ 
+
+          █   █▀▀▄ █▀▀▄ █▀▀
+          █   █▄▄█ █▀▀▄ ▀▀▄
+          ▀▀▀ ▀  ▀ ▀▀▀▀ ▀▀▀
+
+    Brought to you by linuxserver.io
+───────────────────────────────────────

root/etc/s6-overlay/s6-rc.d/init-omada-config/run

@@ -0,0 +1,48 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+#Symlinks
+symlinks=( \
+/app/omada/data \
+/app/omada/properties \
+)
+
+shopt -s globstar dotglob
+
+for i in "${symlinks[@]}"; do
+    if [[ -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        rm -rf "$i"
+    fi
+    if [[ ! -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        mv "$i" /config/
+    fi
+    if [[ -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
+done
+
+symlinks=( \
+/app/omada/logs \
+/app/omada/work \
+)
+
+for i in "${symlinks[@]}"; do
+    if [[ -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        rm -rf "$i"
+    fi
+    if [[ ! -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        mkdir -p /config/"$(basename "$i")"
+    fi
+    if [[ -d /config/"$(basename "$i")" && ! -L "$i"  ]]; then
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
+done
+
+shopt -u globstar dotglob
+
+mkdir -p /app/omada/data/autobackup
+
+#Permissions
+lsiown -R abc:abc \
+  /config \
+  /app

root/etc/s6-overlay/s6-rc.d/init-omada-config/type

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

root/etc/s6-overlay/s6-rc.d/init-omada-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-omada-config/run

root/etc/services.d/omada/run → root/etc/s6-overlay/s6-rc.d/svc-omada/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 case $(uname -m) in
   x86_64)
@@ -34,4 +35,4 @@ exec \
             -XX:HeapDumpPath=${LOG_DIR}/java_heapdump.hprof \
             -Djava.awt.headless=true \
             -Dlog4j2.formatMsgNoLookups=true \
-            com.tplink.smb.omada.starter.OmadaLinuxMain
+            com.tplink.smb.omada.starter.OmadaLinuxMain

root/etc/s6-overlay/s6-rc.d/svc-omada/type

@@ -0,0 +1 @@
+longrun