@kapeta/local-cluster-service 0.5.1 → 0.5.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.5.3](https://github.com/kapetacom/local-cluster-service/compare/v0.5.2...v0.5.3) (2023-06-09)
+
+
+### Bug Fixes
+
+* Make sure bound ports are exposed and ([#29](https://github.com/kapetacom/local-cluster-service/issues/29)) ([fe088b4](https://github.com/kapetacom/local-cluster-service/commit/fe088b424fa159ca1d04e721ace4558a778c5dcd))
+
+## [0.5.2](https://github.com/kapetacom/local-cluster-service/compare/v0.5.1...v0.5.2) (2023-06-06)
+
+
+### Bug Fixes
+
+* Use internal docker host when inside docker ([#28](https://github.com/kapetacom/local-cluster-service/issues/28)) ([3b0ae9d](https://github.com/kapetacom/local-cluster-service/commit/3b0ae9d7612ae54b38ec8e39f632932f8543206e))
+
 ## [0.5.1](https://github.com/kapetacom/local-cluster-service/compare/v0.5.0...v0.5.1) (2023-06-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapeta/local-cluster-service",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
   "main": "index.js",
   "repository": {

package/src/config/routes.js

@@ -134,7 +134,8 @@ router.get('/consumes/resource/:resourceType/:portType/:name', async (req, res)
         req.kapeta.instanceId,
         req.params.resourceType,
         req.params.portType,
-        req.params.name
+        req.params.name,
+        req.kapeta.environment
     );
 
     res.send(operatorInfo);

package/src/containerManager.js

@@ -13,7 +13,7 @@ const LABEL_PORT_PREFIX = 'kapeta_port-';
 
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 2000;
-const HEALTH_CHECK_MAX = 20;
+const HEALTH_CHECK_MAX = 30;
 const IMAGE_PULL_CACHE_TTL = 30 * 60 * 1000;
 const IMAGE_PULL_CACHE = {};
 
@@ -54,6 +54,8 @@ class ContainerManager {
                       // Default http
                       { protocol: 'http', host: 'localhost', port: 2375 },
                       { protocol: 'https', host: 'localhost', port: 2376 },
+                      { protocol: 'http', host: '127.0.0.1', port: 2375 },
+                      { protocol: 'https', host: '127.0.0.1', port: 2376 },
                   ];
         for (const opts of connectOptions) {
             try {
@@ -197,7 +199,10 @@ class ContainerManager {
 
         console.log('Image pulled: %s', image);
 
+        const ExposedPorts = {};
+
         _.forEach(opts.ports, (portInfo, containerPort) => {
+            ExposedPorts['' + containerPort] = {};
             PortBindings['' + containerPort] = [
                 {
                     HostPort: '' + portInfo.hostPort,
@@ -219,11 +224,12 @@ class ContainerManager {
         if (opts.health) {
             HealthCheck = this.toDockerHealth(opts.health);
         }
-
         const dockerContainer = await this.startContainer({
             name: name,
             Image: image,
             Labels,
+            Cmd: opts.cmd,
+            ExposedPorts,
             Env,
             HealthCheck,
             HostConfig: {
@@ -349,6 +355,10 @@ class ContainerInfo {
         this._container = dockerContainer;
     }
 
+    get native() {
+        return this._container;
+    }
+
     async isRunning() {
         const inspectResult = await this.getStatus();
 

package/src/operatorManager.js

@@ -71,7 +71,7 @@ class OperatorManager {
      * @param {string} name
      * @returns {Promise<{host: string, port: (*|string), type: *, protocol: *, credentials: *}>}
      */
-    async getResourceInfo(systemId, fromServiceId, resourceType, portType, name) {
+    async getResourceInfo(systemId, fromServiceId, resourceType, portType, name, environment) {
 
         const operator = this.getOperator(resourceType);
 
@@ -88,7 +88,7 @@ class OperatorManager {
         const dbName = name + '_' + fromServiceId.replace(/[^a-z0-9]/gi, '');
 
         return {
-            host: 'localhost',
+            host: environment === 'docker' ? 'host.docker.internal' : '127.0.0.1',
             port: portInfo.hostPort,
             type: portType,
             protocol: portInfo.protocol,
@@ -163,10 +163,21 @@ class OperatorManager {
                     mounts,
                     ports,
                     health: operatorData.health,
-                    env: operatorData.env
+                    env: operatorData.env,
+                    cmd: operatorData.cmd
                 });
         }
 
+        try {
+            if (operatorData.health) {
+                await containerManager.waitForHealthy(container.native);
+            } else {
+                await containerManager.waitForReady(container.native);
+            }
+        } catch (e) {
+            console.error(e.message);
+        }
+
         return container;
     }
 }

package/src/utils/BlockInstanceRunner.js

@@ -274,10 +274,14 @@ class BlockInstanceRunner {
             ...dockerOpts
         });
 
-        if (HealthCheck) {
-            await containerManager.waitForHealthy(container);
-        } else {
-            await containerManager.waitForReady(container);
+        try {
+            if (HealthCheck) {
+                await containerManager.waitForHealthy(container);
+            } else {
+                await containerManager.waitForReady(container);
+            }
+        } catch (e) {
+            logs.addLog(e.message, 'ERROR');
         }
 
         return this._handleContainer(container, logs);
@@ -408,7 +412,11 @@ class BlockInstanceRunner {
                 }
             });
 
-            await containerManager.waitForReady(container);
+            try {
+                await containerManager.waitForReady(container);
+            } catch (e) {
+                logs.addLog(e.message, 'ERROR');
+            }
         }
 
         return this._handleContainer(container, logs);
@@ -543,10 +551,14 @@ class BlockInstanceRunner {
                 ]
             });
 
-            if (HealthCheck) {
-                await containerManager.waitForHealthy(container);
-            } else {
-                await containerManager.waitForReady(container);
+            try {
+                if (HealthCheck) {
+                    await containerManager.waitForHealthy(container);
+                } else {
+                    await containerManager.waitForReady(container);
+                }
+            } catch (e) {
+                logs.addLog(e.message, 'ERROR');
             }
         }