feat: add instance-specific config

Add support for defining custom mounts in runtime configuration files.

Run with --instance will apply instance-specific runtime configurations
and run in an isolate container environment.

Signed-off-by: reddevillg <reddevillg@gmail.com>

Author: reddevillg

api/schema/v1.json

@@ -1457,6 +1457,18 @@
         },
         "disable_xdp": {
           "type": "boolean"
+        },
+        "mounts": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Mount"
+          }
+        },
+        "instances": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/$defs/RuntimeConfigure"
+          }
         }
       }
     },
@@ -1499,6 +1511,15 @@
           "items": {
             "$ref": "#/$defs/CDIDeviceEntry"
           }
+        },
+        "instance": {
+          "type": "string"
+        },
+        "mounts": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Mount"
+          }
         }
       }
     },
@@ -1545,6 +1566,31 @@
       "enum": [
         "passthru"
       ]
+    },
+    "Mount": {
+      "type": "object",
+      "required": [
+        "destination",
+        "source",
+        "type"
+      ],
+      "properties": {
+        "destination": {
+          "type": "string"
+        },
+        "source": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "options": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
     }
   },
   "type": "object",
@@ -1698,6 +1744,9 @@
     },
     "DeviceOption": {
       "$ref": "#/$defs/DeviceOption"
+    },
+    "Mount": {
+      "$ref": "#/$defs/Mount"
     }
   }
 }

api/schema/v1.yaml

@@ -1103,6 +1103,14 @@ $defs:
           $ref: '#/$defs/DeviceOption'
       disable_xdp:
         type: boolean
+      mounts:
+        type: array
+        items:
+          $ref: '#/$defs/Mount'
+      instances:
+        type: object
+        additionalProperties:
+          $ref: '#/$defs/RuntimeConfigure'
   RunContextConfig:
     title: RunContextConfig
     type: object
@@ -1131,6 +1139,12 @@ $defs:
         type: array
         items:
           $ref: '#/$defs/CDIDeviceEntry'
+      instance:
+        type: string
+      mounts:
+        type: array
+        items:
+          $ref: '#/$defs/Mount'
   CDIDeviceEntry:
     title: CDIDeviceEntry
     type: object
@@ -1162,6 +1176,23 @@ $defs:
   DeviceOption:
     description: device option
     enum: ["passthru"]
+  Mount:
+    type: object
+    required:
+      - destination
+      - source
+      - type
+    properties:
+      destination:
+        type: string
+      source:
+        type: string
+      type:
+        type: string
+      options:
+        type: array
+        items:
+          type: string
 type: object
 properties:
   # NOTE: "properties" is auto generated by referring all types is $defs

apps/ll-cli/src/main.cpp

@@ -201,6 +201,12 @@ ll-cli run org.deepin.demo -- bash -x /path/to/bash/script)"));
       ->delimiter(',')
       ->transform(CLI::CheckedTransformer(deviceOptionMap, CLI::ignore_case))
       ->allow_extra_args(false);
+    cliRun
+      ->add_option("--instance",
+                   runOptions.instance,
+                   _("Specify the container instance name for reuse or identification"))
+      ->type_name("NAME")
+      ->check(validatorString);
     cliRun->add_option("COMMAND", runOptions.commands, _("Run commands in a running sandbox"));
 }
 

libs/api/src/linglong/api/types/v1/Generators.hpp

@@ -50,6 +50,7 @@
 #include "linglong/api/types/v1/PackageInfoDisplay.hpp"
 #include "linglong/api/types/v1/PackageInfo.hpp"
 #include "linglong/api/types/v1/OciConfigurationPatch.hpp"
+#include "linglong/api/types/v1/Mount.hpp"
 #include "linglong/api/types/v1/LayerInfo.hpp"
 #include "linglong/api/types/v1/InteractionRequest.hpp"
 #include "linglong/api/types/v1/InteractionReply.hpp"
@@ -173,6 +174,9 @@ void to_json(json & j, const InteractionRequest & x);
 void from_json(const json & j, LayerInfo & x);
 void to_json(json & j, const LayerInfo & x);
 
+void from_json(const json & j, Mount & x);
+void to_json(json & j, const Mount & x);
+
 void from_json(const json & j, OciConfigurationPatch & x);
 void to_json(json & j, const OciConfigurationPatch & x);
 
@@ -753,6 +757,23 @@ j["info"] = x.info;
 j["version"] = x.version;
 }
 
+inline void from_json(const json & j, Mount& x) {
+x.destination = j.at("destination").get<std::string>();
+x.options = get_stack_optional<std::vector<std::string>>(j, "options");
+x.source = j.at("source").get<std::string>();
+x.type = j.at("type").get<std::string>();
+}
+
+inline void to_json(json & j, const Mount & x) {
+j = json::object();
+j["destination"] = x.destination;
+if (x.options) {
+j["options"] = x.options;
+}
+j["source"] = x.source;
+j["type"] = x.type;
+}
+
 inline void from_json(const json & j, OciConfigurationPatch& x) {
 x.ociVersion = j.at("ociVersion").get<std::string>();
 x.patch = j.at("patch").get<std::vector<nlohmann::json>>();
@@ -1244,6 +1265,8 @@ x.app = get_stack_optional<std::string>(j, "app");
 x.base = get_stack_optional<std::string>(j, "base");
 x.cdiDevices = get_stack_optional<std::vector<CdiDeviceEntry>>(j, "cdiDevices");
 x.extensions = get_stack_optional<std::map<std::string, std::vector<std::string>>>(j, "extensions");
+x.instance = get_stack_optional<std::string>(j, "instance");
+x.mounts = get_stack_optional<std::vector<Mount>>(j, "mounts");
 x.overlayfs = get_stack_optional<std::string>(j, "overlayfs");
 x.runtime = get_stack_optional<std::string>(j, "runtime");
 x.timezone = get_stack_optional<std::string>(j, "timezone");
@@ -1264,6 +1287,12 @@ j["cdiDevices"] = x.cdiDevices;
 if (x.extensions) {
 j["extensions"] = x.extensions;
 }
+if (x.instance) {
+j["instance"] = x.instance;
+}
+if (x.mounts) {
+j["mounts"] = x.mounts;
+}
 if (x.overlayfs) {
 j["overlayfs"] = x.overlayfs;
 }
@@ -1281,6 +1310,8 @@ x.deviceMode = get_stack_optional<std::vector<DeviceOption>>(j, "device_mode");
 x.disableXdp = get_stack_optional<bool>(j, "disable_xdp");
 x.env = get_stack_optional<std::map<std::string, std::string>>(j, "env");
 x.extDefs = get_stack_optional<std::map<std::string, std::vector<ExtensionDefine>>>(j, "ext_defs");
+x.instances = get_stack_optional<std::map<std::string, RuntimeConfigure>>(j, "instances");
+x.mounts = get_stack_optional<std::vector<Mount>>(j, "mounts");
 }
 
 inline void to_json(json & j, const RuntimeConfigure & x) {
@@ -1297,6 +1328,12 @@ j["env"] = x.env;
 if (x.extDefs) {
 j["ext_defs"] = x.extDefs;
 }
+if (x.instances) {
+j["instances"] = x.instances;
+}
+if (x.mounts) {
+j["mounts"] = x.mounts;
+}
 }
 
 inline void from_json(const json & j, UabLayer& x) {
@@ -1380,6 +1417,7 @@ x.interactionMessageType = get_stack_optional<InteractionMessageType>(j, "Intera
 x.interactionReply = get_stack_optional<InteractionReply>(j, "InteractionReply");
 x.interactionRequest = get_stack_optional<InteractionRequest>(j, "InteractionRequest");
 x.layerInfo = get_stack_optional<LayerInfo>(j, "LayerInfo");
+x.mount = get_stack_optional<Mount>(j, "Mount");
 x.ociConfigurationPatch = get_stack_optional<OciConfigurationPatch>(j, "OCIConfigurationPatch");
 x.packageInfo = get_stack_optional<PackageInfo>(j, "PackageInfo");
 x.packageInfoDisplay = get_stack_optional<PackageInfoDisplay>(j, "PackageInfoDisplay");
@@ -1478,6 +1516,9 @@ j["InteractionRequest"] = x.interactionRequest;
 if (x.layerInfo) {
 j["LayerInfo"] = x.layerInfo;
 }
+if (x.mount) {
+j["Mount"] = x.mount;
+}
 if (x.ociConfigurationPatch) {
 j["OCIConfigurationPatch"] = x.ociConfigurationPatch;
 }

libs/api/src/linglong/api/types/v1/LinglongAPIV1.hpp

@@ -37,6 +37,7 @@
 #include "linglong/api/types/v1/InteractionReply.hpp"
 #include "linglong/api/types/v1/InteractionRequest.hpp"
 #include "linglong/api/types/v1/LayerInfo.hpp"
+#include "linglong/api/types/v1/Mount.hpp"
 #include "linglong/api/types/v1/OciConfigurationPatch.hpp"
 #include "linglong/api/types/v1/PackageInfo.hpp"
 #include "linglong/api/types/v1/PackageInfoDisplay.hpp"
@@ -113,6 +114,7 @@ std::optional<InteractionMessageType> interactionMessageType;
 std::optional<InteractionReply> interactionReply;
 std::optional<InteractionRequest> interactionRequest;
 std::optional<LayerInfo> layerInfo;
+std::optional<Mount> mount;
 std::optional<OciConfigurationPatch> ociConfigurationPatch;
 std::optional<PackageInfo> packageInfo;
 std::optional<PackageInfoDisplay> packageInfoDisplay;

libs/api/src/linglong/api/types/v1/Mount.hpp

@@ -0,0 +1,37 @@
+// This file is generated by tools/codegen.sh
+// DO NOT EDIT IT.
+
+// clang-format off
+
+//  To parse this JSON data, first install
+//
+//      json.hpp  https://github.com/nlohmann/json
+//
+//  Then include this file, and then do
+//
+//     Mount.hpp data = nlohmann::json::parse(jsonString);
+
+#pragma once
+
+#include <optional>
+#include <nlohmann/json.hpp>
+#include "linglong/api/types/v1/helper.hpp"
+
+namespace linglong {
+namespace api {
+namespace types {
+namespace v1 {
+using nlohmann::json;
+
+struct Mount {
+std::string destination;
+std::optional<std::vector<std::string>> options;
+std::string source;
+std::string type;
+};
+}
+}
+}
+}
+
+// clang-format on

libs/api/src/linglong/api/types/v1/RunContextConfig.hpp

@@ -18,6 +18,7 @@
 #include "linglong/api/types/v1/helper.hpp"
 
 #include "linglong/api/types/v1/CdiDeviceEntry.hpp"
+#include "linglong/api/types/v1/Mount.hpp"
 
 namespace linglong {
 namespace api {
@@ -30,6 +31,8 @@ std::optional<std::string> app;
 std::optional<std::string> base;
 std::optional<std::vector<CdiDeviceEntry>> cdiDevices;
 std::optional<std::map<std::string, std::vector<std::string>>> extensions;
+std::optional<std::string> instance;
+std::optional<std::vector<Mount>> mounts;
 std::optional<std::string> overlayfs;
 std::optional<std::string> runtime;
 std::optional<std::string> timezone;

libs/api/src/linglong/api/types/v1/RuntimeConfigure.hpp

@@ -18,6 +18,7 @@
 #include "linglong/api/types/v1/helper.hpp"
 
 #include "linglong/api/types/v1/ExtensionDefine.hpp"
+#include "linglong/api/types/v1/Mount.hpp"
 
 namespace linglong {
 namespace api {
@@ -43,6 +44,8 @@ std::optional<std::map<std::string, std::string>> env;
 * external extension definitions to extend the component
 */
 std::optional<std::map<std::string, std::vector<ExtensionDefine>>> extDefs;
+std::optional<std::map<std::string, RuntimeConfigure>> instances;
+std::optional<std::vector<Mount>> mounts;
 };
 }
 }

libs/linglong/src/linglong/cli/cli.cpp

@@ -627,7 +627,7 @@ int Cli::run(const RunOptions &options)
         return -1;
     }
 
-    auto loaded = linglong::utils::loadRuntimeConfig(options.appid);
+    auto loaded = linglong::utils::loadRuntimeConfig(options.appid, options.instance.value_or(""));
     if (!loaded) {
         this->printer.printErr(loaded.error());
         return -1;
@@ -636,14 +636,17 @@ int Cli::run(const RunOptions &options)
 
     runtime::RunContext runContext(this->repository);
     linglong::runtime::ResolveOptions opts;
-    opts.baseRef = options.base;
-    opts.runtimeRef = options.runtime;
-    // 处理多个扩展
-    if (!options.extensions.empty()) {
-        opts.extensionRefs = options.extensions;
+    if (runtimeConfig) {
+        auto cfgRes = opts.applyRuntimeConfig(*runtimeConfig);
+        if (!cfgRes) {
+            this->printer.printErr(cfgRes.error());
+            return -1;
+        }
     }
-    if (runtimeConfig && runtimeConfig->extDefs) {
-        opts.externalExtensionDefs = std::move(runtimeConfig->extDefs).value();
+    auto cliRes = opts.applyCliRunOptions(options);
+    if (!cliRes) {
+        this->printer.printErr(cliRes.error());
+        return -1;
     }
     if (!options.cdiDevices.empty()) {
         auto cdiDevices = cdi::getCDIDevices(options.cdiSpecDir, options.cdiDevices);
@@ -805,7 +808,7 @@ int Cli::runWithContext(const RunOptions &options)
         return -1;
     }
 
-    auto loaded = linglong::utils::loadRuntimeConfig(options.appid);
+    auto loaded = linglong::utils::loadRuntimeConfig(options.appid, options.instance.value_or(""));
     if (!loaded) {
         this->printer.printErr(loaded.error());
         return -1;

libs/linglong/src/linglong/cli/cli.h

@@ -63,6 +63,7 @@ struct RunOptions
     std::vector<std::string> cdiSpecDir = { "/etc/cdi", "/var/run/cdi" };
     std::vector<std::string> cdiDevices;
     std::vector<api::types::v1::DeviceOption> deviceOptions;
+    std::optional<std::string> instance;
 };
 
 struct EnterOptions