@kapeta/local-cluster-service 0.21.5 → 0.22.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.22.0](https://github.com/kapetacom/local-cluster-service/compare/v0.21.5...v0.22.0) (2023-10-17)
+
+
+### Features
+
+* Allow local containers to add Binds ([#85](https://github.com/kapetacom/local-cluster-service/issues/85)) ([c7b46e9](https://github.com/kapetacom/local-cluster-service/commit/c7b46e94412da1eec82503f7d30957fc665e71e6))
+
 ## [0.21.5](https://github.com/kapetacom/local-cluster-service/compare/v0.21.4...v0.21.5) (2023-09-26)
 
 

package/dist/cjs/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/dist/esm/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.21.5",
+    "version": "0.22.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/utils/BlockInstanceRunner.ts

@@ -15,6 +15,7 @@ import { clusterService } from '../clusterService';
 import { AnyMap, BlockProcessParams, InstanceType, ProcessInfo, StringMap } from '../types';
 import { definitionsManager } from '../definitionsManager';
 import Docker from 'dockerode';
+import OS from 'node:os';
 
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
@@ -53,8 +54,8 @@ function getProviderPorts(assetVersion: DefinitionInfo, providerVersion: Definit
         }
         return [DEFAULT_PORT_TYPE];
     }
-
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set<string>(out));
 }
 
 export class BlockInstanceRunner {
@@ -194,6 +195,8 @@ export class BlockInstanceRunner {
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
 
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -214,7 +217,7 @@ export class BlockInstanceRunner {
         const realLocalPath = FS.realpathSync(baseDir);
 
         const Mounts = containerManager.toDockerMounts({
-            [workingDir]: toLocalBindVolume(realLocalPath)
+            [workingDir]: toLocalBindVolume(realLocalPath),
         });
 
         const systemUri = parseKapetaUri(this._systemId);
@@ -245,10 +248,22 @@ export class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind: string) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = OS.homedir() + host.substring(1);
+                        }
+
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+
+                        return `${toLocalBindVolume(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }