@kapeta/local-cluster-service 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.1.2](https://github.com/kapetacom/local-cluster-service/compare/v0.1.1...v0.1.2) (2023-05-06)
+
+
+### Bug Fixes
+
+* Moved all docker init things into init - and rely on that ([9a012c3](https://github.com/kapetacom/local-cluster-service/commit/9a012c3a40a6b4e4ef55757a4b8454d48bd3987c))
+
+## [0.1.1](https://github.com/kapetacom/local-cluster-service/compare/v0.1.0...v0.1.1) (2023-05-06)
+
+
+### Bug Fixes
+
+* Add missing import ([54a570c](https://github.com/kapetacom/local-cluster-service/commit/54a570c8c0746ae014fbf9411c85dbf255bf8cea))
+
 # [0.1.0](https://github.com/kapetacom/local-cluster-service/compare/v0.0.76...v0.1.0) (2023-05-06)
 
 

package/package.json

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

package/src/containerManager.js

@@ -2,7 +2,7 @@ const {Docker} = require("node-docker-api");
 const path = require("path");
 const _ = require('lodash');
 const FS = require("node:fs");
-
+const os = require("os");
 const LABEL_PORT_PREFIX = "kapeta_port-";
 
 const NANO_SECOND = 1000000;
@@ -44,6 +44,7 @@ class ContainerManager {
                 const client = new Docker(opts);
                 await client.ping();
                 this._docker = client;
+                this._alive = true;
                 return;
             } catch (err) {
                 // silently ignore bad configs
@@ -52,38 +53,26 @@ class ContainerManager {
         throw new Error("Unable to connect to docker");
     }
 
-    async ping() {
-        await this._docker.ping();
-        this._alive = true;
-    }
-
     async ping() {
 
         try {
-            const pingResult = await this._docker.ping();
+            const pingResult = await this.docker().ping();
             if (pingResult !== 'OK') {
                 throw new Error(`Ping failed: ${pingResult}`);
             }
         } catch (e) {
             throw new Error(`Docker not running. Please start the docker daemon before running this command. Error: ${e.message}`);
         }
-
-        this._alive = true;
     }
-
-    async ensureAlive() {
-        if (!this._alive) {
-            await this.ping();
+    docker() {
+        if (!this._docker) {
+            throw new Error(`Docker not running`);
         }
-    }
-
-    async docker() {
-        await this.ensureAlive();
         return this._docker;
     }
 
     async getContainerByName(containerName) {
-        const containers = await this._docker.container.list({all: true});
+        const containers = await this.docker().container.list({all: true});
         return containers.find(container => {
             return container.data.Names.indexOf(`/${containerName}`) > -1;
         });
@@ -95,7 +84,7 @@ class ContainerManager {
             tag = 'latest';
         }
 
-        await this._docker.image
+        await this.docker().image
             .create(
                 {},
                 {
@@ -190,7 +179,7 @@ class ContainerManager {
     }
 
     async startContainer(opts) {
-        const dockerContainer = await this._docker.container.create(opts);
+        const dockerContainer = await this.docker().container.create(opts);
 
         await dockerContainer.start();
 
@@ -235,7 +224,7 @@ class ContainerManager {
         let dockerContainer = null;
 
         try {
-            dockerContainer = await this._docker.container.get(name);
+            dockerContainer = await this.docker().container.get(name);
             await dockerContainer.status();
         } catch (err) {
             //Ignore