Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into integration/new-container-runtime

This commit is contained in:
J H
2024-03-18 15:29:08 -06:00

View File

@@ -9,7 +9,7 @@ use clap::builder::ValueParserFactory;
use clap::Parser; use clap::Parser;
use imbl::OrdMap; use imbl::OrdMap;
use imbl_value::{json, InternedString}; use imbl_value::{json, InternedString};
use models::{ActionId, HealthCheckId, ImageId, InvalidId, PackageId}; use models::{ActionId, HealthCheckId, ImageId, PackageId, VolumeId};
use patch_db::json_ptr::JsonPointer; use patch_db::json_ptr::JsonPointer;
use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler}; use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -315,8 +315,9 @@ struct ReverseProxyParams {
struct MountTarget { struct MountTarget {
#[ts(type = "string")] #[ts(type = "string")]
package_id: PackageId, package_id: PackageId,
volume_id: String, #[ts(type = "string")]
subpath: Option<String>, volume_id: VolumeId,
subpath: Option<PathBuf>,
readonly: bool, readonly: bool,
} }
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)] #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]