diff --git a/Makefile b/Makefile index 286f79da5..95bbd2565 100644 --- a/Makefile +++ b/Makefile @@ -209,7 +209,8 @@ $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE) cd core && ARCH=$(ARCH) ./build-prod.sh touch $(BINS) -web/node_modules: web/package.json +web/node_modules: web/package.json + (cd sdk && make bundle) npm --prefix web ci web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC) diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts index ec4fac796..ecd490ea7 100644 --- a/container-runtime/src/Adapters/HostSystemStartOs.ts +++ b/container-runtime/src/Adapters/HostSystemStartOs.ts @@ -196,16 +196,13 @@ export class HostSystemStartOs implements Effects { T.Effects["getServicePortForward"] > } - getSslCertificate( - ...[packageId, algorithm]: Parameters - ) { - return this.rpcRound("getSslCertificate", { - packageId, - algorithm, - }) as ReturnType + getSslCertificate(options: Parameters[0]) { + return this.rpcRound("getSslCertificate", options) as ReturnType< + T.Effects["getSslCertificate"] + > } - getSslKey(...[packageId, algorithm]: Parameters) { - return this.rpcRound("getSslKey", { packageId, algorithm }) as ReturnType< + getSslKey(options: Parameters[0]) { + return this.rpcRound("getSslKey", options) as ReturnType< T.Effects["getSslKey"] > } diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts index 3506575bc..7852a1ec7 100644 --- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts +++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts @@ -33,11 +33,16 @@ export class DockerProcedureContainer { await overlay.mount({ type: "assets", id: mount }, mounts[mount]) } else if (volumeMount.type === "certificate") { volumeMount - const certChain = await effects.getSslCertificate( - null, - volumeMount["interface-id"], - ) - const key = await effects.getSslKey(null, volumeMount["interface-id"]) + const certChain = await effects.getSslCertificate({ + packageId: null, + hostId: volumeMount["interface-id"], + algorithm: null, + }) + const key = await effects.getSslKey({ + packageId: null, + hostId: volumeMount["interface-id"], + algorithm: null, + }) await fs.writeFile( `${path}/${volumeMount["interface-id"]}.cert.pem`, certChain.join("\n"), diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts index c5e6644af..9a64fd33d 100644 --- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts +++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts @@ -186,6 +186,7 @@ export class MainLoop { if ("result" in result) { await effects.setHealth({ + message: null, name: healthId, status: "passing", })