Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

Browse Source
This commit is contained in:
Aiden McClelland
2025-04-07 14:00:42 -06:00
parent 31856d9895 20d3b5288c
commit ab4336cfd7
77 changed files with 1474 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
container-runtime/src/Adapters/EffectCreator.ts
View File

@@ -193,8 +193,8 @@ export function makeEffects(context: EffectContext): Effects {
T.Effects["exposeForDependents"]
>
},
getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
return rpcRound("get-container-ip", {}) as ReturnType<
getContainerIp(...[options]: Parameters<T.Effects["getContainerIp"]>) {
return rpcRound("get-container-ip", options) as ReturnType<
T.Effects["getContainerIp"]
>
},

37
container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
View File

@@ -9,6 +9,7 @@ import { Manifest } from "./matchManifest"
import { DockerProcedureContainer } from "./DockerProcedureContainer"
import * as cp from "child_process"
import { Effects } from "../../../Models/Effects"
import { Mounts } from "@start9labs/start-sdk/package/lib/mainFn/Mounts"
export const execFile = promisify(cp.execFile)
export const polyfillEffects = (
effects: Effects,
@@ -111,7 +112,7 @@ export const polyfillEffects = (
effects,
{ imageId: manifest.main.image },
commands,
{},
{ mounts: Mounts.of() },
commands.join(" "),
)
.then((x: any) => ({
@@ -168,17 +169,12 @@ export const polyfillEffects = (
{ imageId: manifest.main.image },
commands,
{
mounts: [
{
mountpoint: "/drive",
options: {
type: "volume",
id: input.volumeId,
subpath: null,
readonly: false,
},
},
],
mounts: Mounts.of().addVolume(
input.volumeId,
null,
"/drive",
false,
),
},
commands.join(" "),
)
@@ -210,17 +206,12 @@ export const polyfillEffects = (
{ imageId: manifest.main.image },
commands,
{
mounts: [
{
mountpoint: "/drive",
options: {
type: "volume",
id: input.volumeId,
subpath: null,
readonly: false,
},
},
],
mounts: Mounts.of().addVolume(
input.volumeId,
null,
"/drive",
false,
),
},
commands.join(" "),
)