adjust pkg_meta and build/pack scripts to fit new buckyos PackageMeta def

Author: weiqiushi

build_dapp.py

@@ -16,8 +16,9 @@
 print("APP_DOC: ", app_doc);
 version = app_doc["version"];
 app_name = app_doc["pkg_name"];
-app_base_dir = "/opt/buckyosci/apps/"
-app_raw_dir = "/opt/buckyosci/app_build/"
+build_root_dir = os.getenv("BUCKYOS_BUILD_ROOT", "/opt/buckyosci")
+app_base_dir = os.path.join(build_root_dir, "apps")
+app_raw_dir = os.path.join(build_root_dir, "app_build")
 platform_name = platform.system().lower()
 if platform_name == "windows":
     sys_temp_dir = tempfile.gettempdir()
@@ -30,9 +31,10 @@
 
 def process_pkg_meta(pkg_meta_path,new_path,pkg_name):
     pkg_meta = json.load(open(pkg_meta_path));
-    pkg_meta["pub_time"] = int(time.time())
+    pkg_meta["create_time"] = int(time.time())
+    pkg_meta["last_update_time"] = pkg_meta["create_time"]
     pkg_meta["exp"] = int(time.time()) + 3600 * 24 * 365 * 3
-    pkg_meta["pkg_name"] = pkg_name 
+    pkg_meta["name"] = pkg_name 
     json.dump(pkg_meta, open(new_path, "w"));
     return pkg_meta;
 
@@ -73,7 +75,10 @@ def build_app(os_name, arch_name):
         pkg_meta = process_pkg_meta("./publish/docker_pkg_meta.json", f"{sub_pkg_dir}/pkg_meta.json", pkg_id);
         pkg_version = pkg_meta["version"];
         image_name = f"{docker_username}/nightly-{app_name}:{pkg_version}-{arch_name}"
-        result = subprocess.run(["docker", "buildx", "build", "--platform", f"linux/{arch_name}", "-t", image_name, "-f",docker_file,"."])
+        # 加--load参数以便在本地加载镜像, 后续可以save
+        cmd = ["docker", "buildx", "build", "--load", "--platform", f"linux/{arch_name}", "-t", image_name, "-f",docker_file,"."]
+        print("Running command: ", " ".join(cmd))
+        result = subprocess.run(cmd)
         if result.returncode != 0:
             print(f"Docker构建失败: {os_name}-{arch_name}")
             sys.exit(1)
@@ -151,7 +156,7 @@ def main():
 
     app_doc["pub_time"] = int(time.time())
     app_doc["exp"] = int(time.time()) + 3600 * 24 * 365 * 3
-    json.dump(app_doc, open(f"{output_dir}/app.doc.json", "w"));
+    json.dump(app_doc, open(f"{output_dir}/{app_name}.doc.json", "w"));
     print(f"packed app_doc: {app_doc}");
     print("\n--------------------------------");
     print("^ ^ all build done ^ ^, output dir: ", output_dir);

pack_dapp.py

@@ -15,14 +15,14 @@
 print("APP_DOC: ", app_doc);
 version = app_doc["version"];
 app_name = app_doc["pkg_name"];
-app_base_dir = "/opt/buckyosci/apps/"
-app_raw_dir = "/opt/buckyosci/app_build/"
+build_root_dir = os.getenv("BUCKYOS_BUILD_ROOT", "/opt/buckyosci")
+app_base_dir = os.path.join(build_root_dir, "apps")
+app_raw_dir = os.path.join(build_root_dir, "app_build")
 build_target_dir = os.path.join(app_raw_dir, app_name, version);
 app_pkg_dir = os.path.join(app_base_dir, app_name, version);
 
-buckycli_path = os.path.join("/opt/buckyos/bin/buckycli", "buckycli")
-if platform.system() == "Windows":
-    buckycli_path += ".exe"
+# 如果有定义BUCKYCLI_PATH环境变量，就使用这个变量作为CLI的执行文件, 否则默认在linux下，使用默认路径
+buckycli_path = os.getenv("BUCKYCLI_PATH", "/opt/buckyos/bin/buckycli/buckycli")
 
 def get_default_pkg_dir():
     return app_pkg_dir;
@@ -50,7 +50,7 @@ def pack_packages(input_dir, target_dir):
         try:
             with open(meta_file, 'r') as f:
                 meta_data = json.load(f)
-                if "pkg_name" not in meta_data or "version" not in meta_data:
+                if "name" not in meta_data or "version" not in meta_data:
                     print(f"跳过 {pkg_path}: pkg_meta.json 缺少必要字段")
                     continue
 

publish/app_pkg/pkg_meta.json

@@ -1,7 +1,8 @@
 {
-    "pkg_name": "buckyos_filebrowser-app",
+    "name": "buckyos_filebrowser-app",
     "version": "0.5.1",
     "author": "did:web:buckyos.ai",
+    "owner": "did:web:buckyos.ai",
     "description": {
         "detail": "buckyos file browser system app"
     },

publish/docker_pkg_meta.json

@@ -1,7 +1,8 @@
 {
-    "pkg_name": "buckyos_filebrowser-img",
+    "name": "buckyos_filebrowser-img",
     "version": "0.5.1",
     "author": "did:web:buckyos.ai",
+    "owner": "did:web:buckyos.ai",
     "description": {
         "detail": "buckyos file browser docker image"
     },