feat: support base custom application installation location

base可以通过app_prefix信息设置应用安装位置如果base设置了app_prefix, 玲珑在构建时会将PREFIX设置成app_prefix指定的目录在运行时也会将应用文件挂载成app_prefix指定的目录
OpenAtom-Linyaps · Oct 9, 2024 · 601e0bc · 601e0bc
1 parent b203d63
commit 601e0bc
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 21 deletions.
diff --git a/api/schema/v1.json b/api/schema/v1.json
@@ -564,6 +564,10 @@
         "description": {
           "type": "string",
           "description": "description of package info"
+        },
+        "app_prefix": {
+          "type": "string",
+          "description": "application install location. The field is intended solely for the use of the base, indicating the installation path of applications built using that base."
         }
       }
     },

diff --git a/api/schema/v1.yaml b/api/schema/v1.yaml
@@ -454,6 +454,9 @@ $defs:
       description:
         type: string
         description: description of package info
+      app_prefix:
+        type: string
+        description: application install location. The field is intended solely for the use of the base, indicating the installation path of applications built using that base.
   PackageInfo:
     title: PackageInfo
     description: this is the each item output of ll-cli list --json
@@ -668,7 +671,7 @@ $defs:
         type: string
         description: version of linglong at the time of generating the file
       config:
-        $ref: '#/$defs/RepoConfig'
+        $ref: "#/$defs/RepoConfig"
       layers:
         type: array
         items:
@@ -688,7 +691,7 @@ $defs:
               type: string
               description: ostree commit hash
             info:
-              $ref: '#/$defs/PackageInfoV2'
+              $ref: "#/$defs/PackageInfoV2"
 type: object
 properties:
   # NOTE: "properties" is auto generated by referring all types is $defs
diff --git a/apps/generators/05-initialize/src/main.cpp b/apps/generators/05-initialize/src/main.cpp
@@ -58,10 +58,8 @@ int main()
         });
 
         mounts.push_back(
-          { { "destination",
-              std::filesystem::path("/opt/apps") / annotations["org.deepin.linglong.appID"]
-                / "files" },
-            { "options", nlohmann::json::array({ "rbind", "rw" }) },
+          { { "destination", annotations["org.deepin.linglong.appPrefix"] },
+            { "options", nlohmann::json::array({ "rbind", "ro" }) },
             { "source",
               std::filesystem::path(annotations["org.deepin.linglong.appDir"].get<std::string>())
                 / "files" },

diff --git a/apps/generators/25-host-env/src/main.cpp b/apps/generators/25-host-env/src/main.cpp
@@ -6,6 +6,7 @@
 
 #include <filesystem>
 #include <iostream>
+#include <string>
 
 extern char **environ;
 
@@ -80,9 +81,11 @@ int main()
     }
 
     auto annotations = content.at("annotations");
-    env.push_back("LINGLONG_APPID="
-                  + annotations.at("org.deepin.linglong.appID").get<std::string>());
-
+    auto appID = annotations.at("org.deepin.linglong.appID").get<std::string>();
+    // appPrefix
+    auto appPrefix = annotations.at("org.deepin.linglong.appPrefix").get<std::string>();
+    env.push_back("LINGLONG_APPID=" + appID);
+    env.push_back("LINGLONG_appPrefix=" + appPrefix);
     std::cout << content.dump() << std::endl;
     return 0;
 }
diff --git a/apps/uab/loader/src/main.cpp b/apps/uab/loader/src/main.cpp
@@ -641,6 +641,11 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char **argv)
     auto appDir = std::filesystem::path{ layerFilesDir }.parent_path();
 
     annotations["org.deepin.linglong.appDir"] = appDir.string();
+    if (opts.appPrefix) {
+        annotations["org.deepin.linglong.appPrefix"] = *opts.appPrefix;
+    } else {
+        annotations["org.deepin.linglong.appPrefix"] = "/opt/apps/" + opts.appID + "/files";
+    }
     config.annotations = std::move(annotations);
 
     // replace commands

diff --git a/libs/api/src/linglong/api/types/v1/Generators.hpp b/libs/api/src/linglong/api/types/v1/Generators.hpp
@@ -472,6 +472,7 @@ j["version"] = x.version;
 }
 
 inline void from_json(const json & j, PackageInfoV2& x) {
+x.appPrefix = get_stack_optional<std::string>(j, "app_prefix");
 x.arch = j.at("arch").get<std::vector<std::string>>();
 x.base = j.at("base").get<std::string>();
 x.channel = j.at("channel").get<std::string>();
@@ -491,6 +492,9 @@ x.version = j.at("version").get<std::string>();
 
 inline void to_json(json & j, const PackageInfoV2 & x) {
 j = json::object();
+if (x.appPrefix) {
+j["app_prefix"] = x.appPrefix;
+}
 j["arch"] = x.arch;
 j["base"] = x.base;
 j["channel"] = x.channel;

diff --git a/libs/api/src/linglong/api/types/v1/PackageInfoV2.hpp b/libs/api/src/linglong/api/types/v1/PackageInfoV2.hpp
@@ -34,6 +34,11 @@ using nlohmann::json;
 */
 struct PackageInfoV2 {
 /**
+* application install location. The field is intended solely for the use of the base,
+* indicating the installation path of applications built using that base.
+*/
+std::optional<std::string> appPrefix;
+/**
 * arch of package info
 */
 std::vector<std::string> arch;

diff --git a/libs/linglong/src/linglong/builder/linglong_builder.cpp b/libs/linglong/src/linglong/builder/linglong_builder.cpp
@@ -222,8 +222,7 @@ utils::error::Result<void> splitDevelop(QString installFilepath,
             iter.next();
             auto filepath = iter.filePath();
             qDebug() << filepath;
-            // $PROJECT_ROOT/.../files to /opt/apps/${appid}
-            // $PROJECT_ROOT/ to /runtime/
+            // $PROJECT_ROOT/.../files to installPrefix
             filepath.replace(0, src.length(), prefix);
             installRules.append(filepath);
         }
@@ -472,6 +471,7 @@ utils::error::Result<void> Builder::build(const QStringList &args) noexcept
     if (!baseLayerDir) {
         return LINGLONG_ERR(baseLayerDir);
     }
+    auto baseInfo = baseLayerDir->info();
     printReplacedText(QString("%1%2%3%4")
                         .arg(base->id, -25)                 // NOLINT
                         .arg(base->version.toString(), -15) // NOLINT
@@ -547,6 +547,7 @@ set -e
         .runtimeDir = {},
         .baseDir = *baseLayerDir,
         .appDir = {},
+        .appPrefix = baseInfo->appPrefix,
         .patches = {},
         .mounts = {},
         .masks = {},
@@ -557,7 +558,12 @@ set -e
     // 构建安装路径
     QString installPrefix = "/runtime";
     if (this->project.package.kind != "runtime") {
-        installPrefix = QString::fromStdString("/opt/apps/" + this->project.package.id + "/files");
+        if (baseInfo->appPrefix) {
+            installPrefix = QString::fromStdString(*baseInfo->appPrefix);
+        } else {
+            installPrefix =
+              QString::fromStdString("/opt/apps/" + this->project.package.id + "/files");
+        }
     }
     opts.mounts.push_back({
       .destination = installPrefix.toStdString(),
@@ -887,6 +893,10 @@ utils::error::Result<void> Builder::exportUAB(const QString &destination, const
     if (!baseDir) {
         return LINGLONG_ERR(baseDir);
     }
+    auto info = baseDir->info();
+    if (info->appPrefix) {
+        packager.setappPrefix(*info->appPrefix);
+    }
     packager.appendLayer(*baseDir);
 
     if (this->project.runtime) {
@@ -1091,7 +1101,9 @@ utils::error::Result<void> Builder::run(const QStringList &args)
     if (!baseDir) {
         return LINGLONG_ERR(baseDir);
     }
+    auto baseInfo = baseDir->info();
     options.baseDir = QDir(baseDir->absolutePath());
+    options.appPrefix = baseInfo->appPrefix;
 
     if (this->project.runtime) {
         auto ref = pullDependency(QString::fromStdString(*this->project.runtime),

diff --git a/libs/linglong/src/linglong/cli/cli.cpp b/libs/linglong/src/linglong/cli/cli.cpp
@@ -238,6 +238,7 @@ int Cli::run(std::map<std::string, docopt::value> &args)
         this->printer.printErr(LINGLONG_ERRV(baseLayerDir));
         return -1;
     }
+    auto baseInfo = baseLayerDir->info();
 
     auto command = args["COMMAND"].asStringList();
     if (command.empty()) {
@@ -340,6 +341,7 @@ int Cli::run(std::map<std::string, docopt::value> &args)
       .runtimeDir = runtimeLayerDir,
       .baseDir = *baseLayerDir,
       .appDir = *appLayerDir,
+      .appPrefix = baseInfo->appPrefix,
       .patches = {},
       .mounts = std::move(applicationMounts),
       .masks = {},

diff --git a/libs/linglong/src/linglong/package/uab_packager.cpp b/libs/linglong/src/linglong/package/uab_packager.cpp
@@ -17,6 +17,7 @@
 #include <QStandardPaths>
 
 #include <fstream>
+#include <string>
 #include <unordered_set>
 #include <utility>
 
@@ -161,6 +162,12 @@ utils::error::Result<void> UABPackager::setIcon(const QFileInfo &newIcon) noexce
     return LINGLONG_OK;
 }
 
+// set app install dir, default is /opt/apps/$appid/files
+void UABPackager::setappPrefix(const std::string &appPrefix) noexcept
+{
+    m_appPrefix = appPrefix;
+}
+
 utils::error::Result<void> UABPackager::appendLayer(const LayerDir &layer) noexcept
 {
     LINGLONG_TRACE("append layer to uab")
@@ -540,8 +547,13 @@ utils::error::Result<void> UABPackager::prepareBundle(const QDir &bundleDir) noe
     QTextStream stream{ &ldConf };
     stream << "/runtime/lib" << Qt::endl;
     stream << "/runtime/lib/" + arch->getTriplet() << Qt::endl;
-    stream << "/opt/apps/" + appID + "/files/lib" << Qt::endl;
-    stream << "/opt/apps/" + appID + "/files/lib/" + arch->getTriplet() << Qt::endl;
+    auto appPrefix = "/opt/apps/" + appID + "/files";
+    if (m_appPrefix) {
+        appPrefix = QString::fromStdString(*m_appPrefix);
+    }
+    stream << appPrefix + "/lib" << Qt::endl;
+    stream << appPrefix + "/lib/" + arch->getTriplet() << Qt::endl;
+
     stream.flush();
 
     // copy ll-box

diff --git a/libs/linglong/src/linglong/package/uab_packager.h b/libs/linglong/src/linglong/package/uab_packager.h
@@ -17,6 +17,7 @@
 #include <QUuid>
 
 #include <filesystem>
+#include <string>
 #include <unordered_set>
 
 namespace linglong::package {
@@ -67,6 +68,7 @@ class UABPackager
     UABPackager(UABPackager &&) = delete;
 
     utils::error::Result<void> setIcon(const QFileInfo &icon) noexcept;
+    void setappPrefix(const std::string &appPrefix) noexcept;
     utils::error::Result<void> appendLayer(const LayerDir &layer) noexcept;
     utils::error::Result<void> pack(const QString &uabFilename) noexcept;
     utils::error::Result<void> exclude(const std::vector<std::string> &files) noexcept;
@@ -85,6 +87,7 @@ class UABPackager
     std::unordered_set<std::string> excludeFiles;
     std::unordered_set<std::string> includeFiles;
     std::optional<QFileInfo> icon{ std::nullopt };
+    std::optional<std::string> m_appPrefix;
     api::types::v1::UabMetaInfo meta;
     QDir buildDir;
 };

diff --git a/libs/linglong/src/linglong/runtime/container.cpp b/libs/linglong/src/linglong/runtime/container.cpp
@@ -151,10 +151,16 @@ Container::run(const ocppi::runtime::config::types::Process &process) noexcept
 
         ofs << "/runtime/lib" << std::endl;
         ofs << "/runtime/lib/" + arch->getTriplet().toStdString() << std::endl;
-        ofs << "/opt/apps/" + this->appID.toStdString() + "/files/lib" << std::endl;
-        ofs << "/opt/apps/" + this->appID.toStdString() + "/files/lib/"
-            + arch->getTriplet().toStdString()
-            << std::endl;
+
+        auto appPrefix = "/opt/apps/" + this->appID.toStdString() + "/files";
+        if (cfg.annotations) {
+            auto annotations = *cfg.annotations;
+            if (annotations.find("org.deepin.linglong.appPrefix") != annotations.end()) {
+                appPrefix = annotations["org.deepin.linglong.appPrefix"];
+            }
+        }
+        ofs << appPrefix + "/lib" << std::endl;
+        ofs << appPrefix + "/lib/" + arch->getTriplet().toStdString() << std::endl;
     }
     this->cfg.mounts->push_back(ocppi::runtime::config::types::Mount{
       .destination = "/etc/ld.so.conf.d/zz_deepin-linglong-app.conf",

diff --git a/libs/linglong/src/linglong/runtime/container_builder.cpp b/libs/linglong/src/linglong/runtime/container_builder.cpp
@@ -248,6 +248,12 @@ auto getOCIConfig(const ContainerOptions &opts) noexcept
     if (opts.appDir) {
         annotations["org.deepin.linglong.appDir"] = opts.appDir->absolutePath().toStdString();
     }
+    if (opts.appPrefix) {
+        annotations["org.deepin.linglong.appPrefix"] = *opts.appPrefix;
+    } else {
+        annotations["org.deepin.linglong.appPrefix"] =
+          "/opt/apps/" + opts.appID.toStdString() + "/files";
+    }
     config->annotations = std::move(annotations);
 
     QDir configDotDDir = QFileInfo(containerConfigFilePath).dir().filePath("config.d");

diff --git a/libs/linglong/src/linglong/runtime/container_builder.h b/libs/linglong/src/linglong/runtime/container_builder.h
@@ -22,9 +22,10 @@ struct ContainerOptions
     QString appID;
     QString containerID;
 
-    std::optional<QDir> runtimeDir; // mount to /runtime
-    QDir baseDir;                   // mount to /
-    std::optional<QDir> appDir;     // mount to /opt/apps/${info.appid}/files
+    std::optional<QDir> runtimeDir;       // mount to /runtime
+    QDir baseDir;                         // mount to /
+    std::optional<QDir> appDir;           // mount to /opt/apps/${info.appid}/files
+    std::optional<std::string> appPrefix; // if appPrefix exists, mount appDir to appPrefix
 
     std::vector<api::types::v1::OciConfigurationPatch> patches;
     std::vector<ocppi::runtime::config::types::Mount> mounts; // extra mounts