update bmtedge to new implements

linkease · Oct 20, 2023 · dc448b9 · dc448b9
1 parent 1b815ac
commit dc448b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/applications/luci-app-bmtedge/Makefile b/applications/luci-app-bmtedge/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.0-20230615
+PKG_VERSION:=1.0.1-20231020
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for bmtedge

diff --git a/applications/luci-app-bmtedge/luasrc/model/cbi/bmtedge.lua b/applications/luci-app-bmtedge/luasrc/model/cbi/bmtedge.lua
@@ -23,6 +23,8 @@ o.rmempty = false
 o.datatype = "string"
 o:value("jinshanyun/jinshan-x86_64", "jinshanyun/jinshan-x86_64")
 o:value("jinshanyun/jinshan-arm64", "jinshanyun/jinshan-arm64")
+o:value("jinshanyun/jinshan-x86_64:v1.2", "jinshanyun/jinshan-x86_64:v1.2")
+o:value("jinshanyun/jinshan-arm64:v2.2", "jinshanyun/jinshan-arm64:v2.2")
 o.default = default_image
 
 local default_uid = bmtedge_model.default_uid()

diff --git a/applications/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh b/applications/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh
@@ -13,6 +13,12 @@ do_install() {
       exit 1
   fi
 
+  local netdev=`ip route list|awk ' /^default/ {print $5}'`
+  if [ -z "$netdev" ]; then
+      echo "defualt gateway is empty!"
+      exit 1
+  fi
+
   [ -z "$image_name" ] && image_name="jinshanyun/jinshan-x86_64:latest"
   echo "docker pull ${image_name}"
   docker pull ${image_name}
@@ -22,14 +28,14 @@ do_install() {
     --privileged \
     --network=host \
     --dns=127.0.0.1 \
+    --dns=223.5.5.5 \
     --tmpfs /run \
     --tmpfs /tmp \
     -v \"$path:/data/ksc1\" \
     -v \"$path/containerd:/var/lib/containerd\" \
-    -e ksc_supplier_code=\"92101\" \
     -e ksc_datadir=\"/data/ksc1\" \
-    -e ksc_machine_code=\"lsyK17032_$uid\" \
-    -e ksc_refer=\"ruiyun_node\""
+    -e ksc_net=\"$netdev\" \
+    -e ksc_machine_code=\"lsyK17032_$uid\" "
 
   local tz="`uci get system.@system[0].zonename`"
   [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"