Merge pull request #7 from linuxserver-labs/arm

Author: thespad

.github/workflows/call-build-image.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v2
+    uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v3
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "omada-controller"

.github/workflows/call-check-and-release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v2
+    uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v3
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "omada-controller"

docker-bake.hcl

@@ -16,6 +16,7 @@ target "image-local" {
 target "image-all" {
   inherits = ["image"]
   platforms = [
-    "linux/amd64"
+    "linux/amd64",
+    "linux/arm64"
   ]
 }

root/etc/services.d/omada/run

@@ -1,4 +1,13 @@
 #!/usr/bin/with-contenv bash
 
+case $(uname -m) in
+  x86_64)
+    ARCH="amd64";
+    ;;
+  aarch64)
+    ARCH="arm64";
+    ;;
+esac
+
 exec \
-    s6-setuidgid abc /usr/bin/jsvc -cwd /app/omada/lib -nodetach -pidfile /config/omada.pid -home /usr/lib/jvm/java-8-openjdk-amd64/jre/ -cp /usr/share/java/commons-daemon.jar:/app/omada/lib/* -outfile /app/omada/logs/startup.log -errfile /app/omada/logs/error.log -user abc -procname omada -showversion -server -Xms128m -Xmx1024m -XX:MaxHeapFreeRatio=60 -XX:MinHeapFreeRatio=30 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/omada/logs/java_heapdump.hprof com.tplink.omada.start.OmadaLinuxMain
+    s6-setuidgid abc /usr/bin/jsvc -cwd /app/omada/lib -nodetach -pidfile /config/omada.pid -home /usr/lib/jvm/java-8-openjdk-${ARCH}/jre/ -cp /usr/share/java/commons-daemon.jar:/app/omada/lib/* -outfile /app/omada/logs/startup.log -errfile /app/omada/logs/error.log -user abc -procname omada -showversion -server -Xms128m -Xmx1024m -XX:MaxHeapFreeRatio=60 -XX:MinHeapFreeRatio=30 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/omada/logs/java_heapdump.hprof com.tplink.omada.start.OmadaLinuxMain