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

container-runtime/src/Adapters/EffectCreator.ts

@@ -36,7 +36,7 @@ let hostSystemId = 0
 export type EffectContext = {
   procedureId: string | null
   callbacks?: CallbackHolder
-  constRetry: () => void
+  constRetry?: () => void
 }
 
 const rpcRoundFor =

container-runtime/src/Adapters/RpcListener.ts

@@ -306,7 +306,6 @@ export class RpcListener {
         const effects = makeEffects({
           procedureId: null,
           callbacks,
-          constRetry: () => {},
         })
         return handleRpc(
           id,
@@ -337,7 +336,6 @@ export class RpcListener {
               this.callbacks = new CallbackHolder(
                 makeEffects({
                   procedureId: null,
-                  constRetry: () => {},
                 }),
               )
               const callbacks = this.callbackHolderFor("containerInit")
@@ -345,7 +343,6 @@ export class RpcListener {
                 makeEffects({
                   procedureId: null,
                   callbacks,
-                  constRetry: () => {},
                 }),
               )
               this._system = system
@@ -427,7 +424,6 @@ export class RpcListener {
     const effects = makeEffects({
       procedureId,
       callbacks,
-      constRetry: () => {},
     })
 
     return (async () => {

container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts

@@ -62,7 +62,7 @@ export class DockerProcedureContainer {
           )
         } else if (volumeMount.type === "assets") {
           await subcontainer.mount(
-            { type: "assets", id: mount, subpath: null },
+            { type: "assets", subpath: mount },
             mounts[mount],
           )
         } else if (volumeMount.type === "certificate") {

container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts

@@ -170,7 +170,7 @@ export const polyfillEffects = (
           {
             mounts: [
               {
-                path: "/drive",
+                mountpoint: "/drive",
                 options: {
                   type: "volume",
                   id: input.volumeId,
@@ -212,7 +212,7 @@ export const polyfillEffects = (
           {
             mounts: [
               {
-                path: "/drive",
+                mountpoint: "/drive",
                 options: {
                   type: "volume",
                   id: input.volumeId,