Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure datadir on context

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-03 14:03:08 -06:00
committed by Aiden McClelland
parent ee381ebce7
commit 3877e43b84
33 changed files with 664 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
appmgr/src/action/docker.rs
View File

@@ -7,6 +7,7 @@ use indexmap::IndexMap;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use crate::context::RpcContext;
use crate::id::{Id, ImageId};
use crate::s9pk::manifest::{PackageId, SYSTEM_PACKAGE_ID};
use crate::util::{IoFormat, Version};
@@ -36,6 +37,7 @@ pub struct DockerAction {
impl DockerAction {
pub async fn execute<I: Serialize, O: for<'de> Deserialize<'de>>(
&self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
name: Option<&str>,
@@ -55,7 +57,7 @@ impl DockerAction {
.arg(Self::container_name(pkg_id, name));
}
cmd.args(
self.docker_args(pkg_id, pkg_version, volumes, allow_inject)
self.docker_args(ctx, pkg_id, pkg_version, volumes, allow_inject)
.await,
);
let input_buf = if let (Some(input), Some(format)) = (&input, &self.io_format) {
@@ -108,6 +110,7 @@ impl DockerAction {
pub async fn sandboxed<I: Serialize, O: for<'de> Deserialize<'de>>(
&self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
volumes: &Volumes,
@@ -116,7 +119,7 @@ impl DockerAction {
let mut cmd = tokio::process::Command::new("docker");
cmd.arg("run").arg("--rm").arg("--network=none");
cmd.args(
self.docker_args(pkg_id, pkg_version, &volumes.to_readonly(), false)
self.docker_args(ctx, pkg_id, pkg_version, &volumes.to_readonly(), false)
.await,
);
let input_buf = if let (Some(input), Some(format)) = (&input, &self.io_format) {
@@ -187,6 +190,7 @@ impl DockerAction {
async fn docker_args<'a>(
&'a self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
volumes: &Volumes,
@@ -204,7 +208,7 @@ impl DockerAction {
} else {
continue;
};
let src = dbg!(volume.path_for(pkg_id, pkg_version, volume_id));
let src = dbg!(volume.path_for(ctx, pkg_id, pkg_version, volume_id));
if tokio::fs::metadata(&src).await.is_err() {
continue;
}

11
appmgr/src/action/mod.rs
View File

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
use self::docker::DockerAction;
use crate::config::{Config, ConfigSpec};
use crate::context::RpcContext;
use crate::id::Id;
use crate::s9pk::manifest::PackageId;
use crate::util::{ValuePrimative, Version};
@@ -90,6 +91,7 @@ pub struct Action {
impl Action {
pub async fn execute(
&self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
volumes: &Volumes,
@@ -100,6 +102,7 @@ impl Action {
.with_kind(crate::ErrorKind::ConfigSpecViolation)?;
self.implementation
.execute(
ctx,
pkg_id,
pkg_version,
Some(&format!("{}Action", self.name)),
@@ -121,6 +124,7 @@ pub enum ActionImplementation {
impl ActionImplementation {
pub async fn execute<I: Serialize, O: for<'de> Deserialize<'de>>(
&self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
name: Option<&str>,
@@ -131,13 +135,14 @@ impl ActionImplementation {
match self {
ActionImplementation::Docker(action) => {
action
.execute(pkg_id, pkg_version, name, volumes, input, allow_inject)
.execute(ctx, pkg_id, pkg_version, name, volumes, input, allow_inject)
.await
}
}
}
pub async fn sandboxed<I: Serialize, O: for<'de> Deserialize<'de>>(
&self,
ctx: &RpcContext,
pkg_id: &PackageId,
pkg_version: &Version,
volumes: &Volumes,
@@ -145,7 +150,9 @@ impl ActionImplementation {
) -> Result<Result<O, (i32, String)>, Error> {
match self {
ActionImplementation::Docker(action) => {
action.sandboxed(pkg_id, pkg_version, volumes, input).await
action
.sandboxed(ctx, pkg_id, pkg_version, volumes, input)
.await
}
}
}