1.0.104

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -4,35 +4,46 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
+
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-  - npmci git mirror
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
+    - lossless
     - docker
-  - notpriv
+  allow_failure: true
 
-snyk:
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm install -g snyk
+    - npmci command pnpm audit --audit-level=high --dev
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
   tags:
+    - lossless
     - docker
-  - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -41,26 +52,22 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
 
 release:
   stage: release
@@ -70,6 +77,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -79,11 +87,14 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
+    - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,20 +105,18 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,38 +0,0 @@
-# @mojoio/docker
-unofficial docker engine api abstraction package written in TypeScript
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/docker)
-* [gitlab.com (source)](https://gitlab.com/mojoio/docker)
-* [github.com (source mirror)](https://github.com/mojoio/docker)
-* [docs (typedoc)](https://mojoio.gitlab.io/docker/)
-
-## Status for master
-[![build status](https://gitlab.com/mojoio/docker/badges/master/build.svg)](https://gitlab.com/mojoio/docker/commits/master)
-[![coverage report](https://gitlab.com/mojoio/docker/badges/master/coverage.svg)](https://gitlab.com/mojoio/docker/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/docker.svg)](https://www.npmjs.com/package/@mojoio/docker)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/docker/badge.svg)](https://snyk.io/test/npm/@mojoio/docker)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-```typescript
-import { DockerHost } from '@mojoio/docker'; // require Dockersock class
-
-const run = async () => {
-  const myDockerHost = new DockerHost(); // optional: you can pass a domain to the contructor, defaults to  /var/run/docker.sock
-
-  const containers = await myDockerHost.getContainers(); // promise, resolve with an array of DockerContainers
-};
-```
-
-For further information read the linked docs at the top of this readme.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -10,11 +10,12 @@
     "npmRegistryUrl": "registry.npmjs.org"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "mojoio",
       "gitrepo": "docker",
-      "shortDescription": "unofficial docker engine api abstraction package written in TypeScript",
+      "description": "unofficial docker engine api abstraction package written in TypeScript",
       "npmPackagename": "@mojoio/docker",
       "license": "MIT"
     }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "@mojoio/docker",
-  "version": "1.0.73",
+  "version": "1.0.104",
   "description": "easy communication with docker remote api from node, TypeScript ready",
   "private": false,
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "tstest test/",
+    "test": "(tstest test/ --web)",
-    "build": "tsbuild"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -27,36 +29,39 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
+    "@pushrocks/lik": "^6.0.0",
-    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/smartfile": "^10.0.5",
-    "@pushrocks/smartjson": "^3.0.8",
+    "@pushrocks/smartjson": "^5.0.2",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog": "^3.0.1",
-    "@pushrocks/smartnetwork": "^1.1.14",
+    "@pushrocks/smartnetwork": "^3.0.0",
-    "@pushrocks/smartpath": "^4.0.1",
+    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.26",
+    "@pushrocks/smartrequest": "^2.0.11",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@pushrocks/smartstring": "^4.0.5",
-    "@pushrocks/smartversion": "^2.0.4",
+    "@pushrocks/smartversion": "^3.0.2",
-    "rxjs": "^6.5.3"
+    "@tsclass/tsclass": "^4.0.24",
+    "rxjs": "^7.5.7"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^12.7.4",
+    "@types/node": "^18.11.0"
-    "tslint": "^5.19.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -0,0 +1,49 @@
+# @mojoio/docker
+unofficial docker engine api abstraction package written in TypeScript
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/docker)
+* [gitlab.com (source)](https://gitlab.com/mojoio/docker)
+* [github.com (source mirror)](https://github.com/mojoio/docker)
+* [docs (typedoc)](https://mojoio.gitlab.io/docker/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/docker/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/docker/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/docker)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/mojoio/docker)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@mojoio/docker)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@mojoio/docker)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@mojoio/docker)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+```typescript
+import { DockerHost } from '@mojoio/docker'; // require Dockersock class
+
+const run = async () => {
+  const myDockerHost = new DockerHost(); // optional: you can pass a domain to the contructor, defaults to  /var/run/docker.sock
+
+  const containers = await myDockerHost.getContainers(); // promise, resolve with an array of DockerContainers
+};
+```
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.nonci.node.ts

@@ -1,11 +1,11 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as docker from '../ts/index';
+import * as docker from '../ts/index.js';
 
 let testDockerHost: docker.DockerHost;
 
 tap.test('should create a new Dockersock instance', async () => {
   testDockerHost = new docker.DockerHost('http://unix:/var/run/docker.sock:');
-  return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
+  return expect(testDockerHost).toBeInstanceOf(docker.DockerHost);
 });
 
 tap.test('should create a docker swarm', async () => {
@@ -26,10 +26,10 @@ tap.test('should list networks', async () => {
 
 tap.test('should create a network', async () => {
   const newNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
-    Name: 'webgateway'
+    Name: 'webgateway',
   });
-  expect(newNetwork).to.be.instanceOf(docker.DockerNetwork);
+  expect(newNetwork).toBeInstanceOf(docker.DockerNetwork);
-  expect(newNetwork.Name).to.equal('webgateway');
+  expect(newNetwork.Name).toEqual('webgateway');
 });
 
 tap.test('should remove a network', async () => {
@@ -41,15 +41,15 @@ tap.test('should remove a network', async () => {
 tap.test('should pull an image from imagetag', async () => {
   const image = await docker.DockerImage.createFromRegistry(testDockerHost, {
     imageUrl: 'hosttoday/ht-docker-node',
-    imageTag: 'alpine'
+    imageTag: 'alpine',
   });
-  expect(image).to.be.instanceOf(docker.DockerImage);
+  expect(image).toBeInstanceOf(docker.DockerImage);
   console.log(image);
 });
 
-tap.test('should return a change Observable', async tools => {
+tap.test('should return a change Observable', async (tools) => {
   const testObservable = await testDockerHost.getEventObservable();
-  const subscription = testObservable.subscribe(changeObject => {
+  const subscription = testObservable.subscribe((changeObject) => {
     console.log(changeObject);
   });
   await tools.delayFor(2000);
@@ -62,7 +62,7 @@ tap.test('should create a secret', async () => {
     name: 'testSecret',
     version: '1.0.3',
     contentArg: `{ "hi": "wow"}`,
-    labels: {}
+    labels: {},
   });
   console.log(mySecret);
 });
@@ -77,34 +77,32 @@ tap.test('should activate swarm mode', async () => {
   await testDockerHost.activateSwarm();
 });
 
-tap.test('should list all services', async tools => {
+tap.test('should list all services', async (tools) => {
   const services = await testDockerHost.getServices();
   console.log(services);
 });
 
 tap.test('should create a service', async () => {
   const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
-    Name: 'testNetwork'
+    Name: 'testNetwork',
   });
   const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
-    name: 'serviceSecret',
+    name: 'testSecret',
     version: '0.0.1',
     labels: {},
-    contentArg: '{"hi": "wow"}'
+    contentArg: '{"hi": "wow"}',
   });
   const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
-    imageUrl: 'nginx:latest'
+    imageUrl: 'registry.gitlab.com/hosttoday/ht-docker-static',
   });
   const testService = await docker.DockerService.createService(testDockerHost, {
     image: testImage,
-    labels: {
+    labels: {},
-      testlabel: 'hi'
-    },
     name: 'testService',
     networks: [testNetwork],
     networkAlias: 'testService',
     secrets: [testSecret],
-    ports: []
+    ports: ['3000:80'],
   });
 
   await testService.remove();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@mojoio/docker',
+  version: '1.0.104',
+  description: 'easy communication with docker remote api from node, TypeScript ready'
+}

ts/docker.classes.container.ts

@@ -1,7 +1,8 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './docker.classes.host.js';
+import { logger } from './docker.logging.js';
 
 export class DockerContainer {
   // STATIC
@@ -37,22 +38,19 @@ export class DockerContainer {
   ) {
     // check for unique hostname
     const existingContainers = await DockerContainer.getContainers(dockerHost);
-    const sameHostNameContainer = existingContainers.find(container => {
+    const sameHostNameContainer = existingContainers.find((container) => {
       // TODO implement HostName Detection;
       return false;
     });
     const response = await dockerHost.request('POST', '/containers/create', {
       Hostname: containerCreationDescriptor.Hostname,
       Domainname: containerCreationDescriptor.Domainname,
-      User: 'root'
+      User: 'root',
     });
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log('info', 'Container created successfully');
+      logger.log('info', 'Container created successfully');
     } else {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('error', 'There has been a problem when creating the container');
-        'error',
-        'There has been a problem when creating the container'
-      );
     }
   }
 
@@ -94,7 +92,7 @@ export class DockerContainer {
   public Mounts: any;
   constructor(dockerHostArg: DockerHost, dockerContainerObjectArg: any) {
     this.dockerHost = dockerHostArg;
-    Object.keys(dockerContainerObjectArg).forEach(keyArg => {
+    Object.keys(dockerContainerObjectArg).forEach((keyArg) => {
       this[keyArg] = dockerContainerObjectArg[keyArg];
     });
   }

ts/docker.classes.host.ts

@@ -1,7 +1,8 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import { DockerContainer } from './docker.classes.container';
+import { DockerContainer } from './docker.classes.container.js';
-import { DockerNetwork } from './docker.classes.network';
+import { DockerNetwork } from './docker.classes.network.js';
-import { DockerService } from './docker.classes.service';
+import { DockerService } from './docker.classes.service.js';
+import { logger } from './docker.logging.js';
 
 export interface IAuthData {
   serveraddress: string;
@@ -45,7 +46,7 @@ export class DockerHost {
     }
     console.log(response.body.Status);
     this.registryToken = plugins.smartstring.base64.encode(
-      plugins.smartjson.Smartjson.stringify(authData, {})
+      plugins.smartjson.stringify(authData)
     );
   }
 
@@ -61,7 +62,7 @@ export class DockerHost {
     await this.auth({
       username: gitlabAuthArray[0],
       password: gitlabAuthArray[1],
-      serveraddress: 'registry.gitlab.com'
+      serveraddress: 'registry.gitlab.com',
     });
   }
 
@@ -97,8 +98,8 @@ export class DockerHost {
    */
   public async getEventObservable(): Promise<plugins.rxjs.Observable<any>> {
     const response = await this.requestStreaming('GET', '/events');
-    return plugins.rxjs.Observable.create(observer => {
+    return plugins.rxjs.Observable.create((observer) => {
-      response.on('data', data => {
+      response.on('data', (data) => {
         const eventString = data.toString();
         try {
           const eventObject = JSON.parse(eventString);
@@ -135,12 +136,12 @@ export class DockerHost {
       DataPathPort: 4789,
       DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'],
       SubnetSize: 24,
-      ForceNewCluster: false
+      ForceNewCluster: false,
     });
     if (response.statusCode === 200) {
-      plugins.smartlog.defaultLogger.log('info', 'created Swam succesfully');
+      logger.log('info', 'created Swam succesfully');
     } else {
-      plugins.smartlog.defaultLogger.log('error', 'could not initiate swarm');
+      logger.log('error', 'could not initiate swarm');
     }
   }
 
@@ -154,10 +155,10 @@ export class DockerHost {
       headers: {
         'Content-Type': 'application/json',
         'X-Registry-Auth': this.registryToken,
-        Host: 'docker.sock'
+        Host: 'docker.sock',
       },
       requestBody: dataArg,
-      keepAlive: false
+      keepAlive: false,
     });
     if (response.statusCode !== 200) {
       console.log(response.body);
@@ -174,10 +175,10 @@ export class DockerHost {
         headers: {
           'Content-Type': 'application/json',
           'X-Registry-Auth': this.registryToken,
-          Host: 'docker.sock'
+          Host: 'docker.sock',
         },
         requestBody: null,
-        keepAlive: false
+        keepAlive: false,
       },
       true
     );

ts/docker.classes.image.ts

@@ -1,6 +1,7 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './docker.classes.host.js';
+import { logger } from './docker.logging.js';
 
 export class DockerImage {
   // STATIC
@@ -15,7 +16,7 @@ export class DockerImage {
 
   public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
     const images = await this.getImages(dockerHost);
-    const result = images.find(image => {
+    const result = images.find((image) => {
       if (image.RepoTags) {
         return image.RepoTags.includes(imageNameArg);
       } else {
@@ -37,7 +38,7 @@ export class DockerImage {
     } = {
       imageUrl: creationObject.imageUrl,
       imageTag: creationObject.imageTag,
-      imageOriginTag: null
+      imageOriginTag: null,
     };
     if (imageUrlObject.imageUrl.includes(':')) {
       const imageUrl = imageUrlObject.imageUrl.split(':')[0];
@@ -63,14 +64,11 @@ export class DockerImage {
       )}&tag=${encodeURIComponent(imageUrlObject.imageTag)}`
     );
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('info', `Successfully pulled image ${imageUrlObject.imageUrl} from the registry`);
-        'info',
-        `Successfully pulled image ${imageUrlObject.imageUrl} from the registry`
-      );
       const image = await DockerImage.findImageByName(dockerHostArg, imageUrlObject.imageOriginTag);
       return image;
     } else {
-      plugins.smartlog.defaultLogger.log('error', `Failed at the attempt of creating a new image`);
+      logger.log('error', `Failed at the attempt of creating a new image`);
     }
   }
 
@@ -110,7 +108,7 @@ export class DockerImage {
 
   constructor(dockerHostArg, dockerImageObjectArg: any) {
     this.dockerHost = dockerHostArg;
-    Object.keys(dockerImageObjectArg).forEach(keyArg => {
+    Object.keys(dockerImageObjectArg).forEach((keyArg) => {
       this[keyArg] = dockerImageObjectArg[keyArg];
     });
   }
@@ -128,7 +126,7 @@ export class DockerImage {
    */
   public async pullLatestImageFromRegistry(): Promise<boolean> {
     const updatedImage = await DockerImage.createFromRegistry(this.dockerHost, {
-      imageUrl: this.RepoTags[0]
+      imageUrl: this.RepoTags[0],
     });
     Object.assign(this, updatedImage);
     // TODO: Compare image digists before and after
@@ -137,6 +135,10 @@ export class DockerImage {
 
   // get stuff
   public async getVersion() {
+    if (this.Labels && this.Labels.version) {
       return this.Labels.version;
+    } else {
+      return '0.0.0';
+    }
   }
 }

ts/docker.classes.network.ts

@@ -1,7 +1,9 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './docker.classes.host.js';
+import { DockerService } from './docker.classes.service.js';
+import { logger } from './docker.logging.js';
 
 export class DockerNetwork {
   public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> {
@@ -17,7 +19,7 @@ export class DockerNetwork {
 
   public static async getNetworkByName(dockerHost: DockerHost, dockerNetworkNameArg: string) {
     const networks = await DockerNetwork.getNetworks(dockerHost);
-    return networks.find(dockerNetwork => dockerNetwork.Name === dockerNetworkNameArg);
+    return networks.find((dockerNetwork) => dockerNetwork.Name === dockerNetworkNameArg);
   }
 
   public static async createNetwork(
@@ -29,28 +31,25 @@ export class DockerNetwork {
       CheckDuplicate: true,
       Driver: 'overlay',
       EnableIPv6: false,
-      IPAM: {
+      /* IPAM: {
         Driver: 'default',
         Config: [
           {
-            Subnet: '172.20.10.0/16',
+            Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`,
-            IPRange: '172.20.10.0/24',
+            IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`,
-            Gateway: '172.20.10.11'
+            Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11`
           }
         ]
-      },
+      }, */
-      Internal: true,
+      Internal: false,
       Attachable: true,
-      Ingress: false
+      Ingress: false,
     });
     if (response.statusCode < 300) {
-      plugins.smartlog.defaultLogger.log('info', 'Created network successfully');
+      logger.log('info', 'Created network successfully');
       return await DockerNetwork.getNetworkByName(dockerHost, networkCreationDescriptor.Name);
     } else {
-      plugins.smartlog.defaultLogger.log(
+      logger.log('error', 'There has been an error creating the wanted network');
-        'error',
-        'There has been an error creating the wanted network'
-      );
       return null;
     }
   }
@@ -90,4 +89,30 @@ export class DockerNetwork {
   public async remove() {
     const response = await this.dockerHost.request('DELETE', `/networks/${this.Id}`);
   }
+
+  public async getContainersOnNetwork(): Promise<
+    Array<{
+      Name: string;
+      EndpointID: string;
+      MacAddress: string;
+      IPv4Address: string;
+      IPv6Address: string;
+    }>
+  > {
+    const returnArray = [];
+    const response = await this.dockerHost.request('GET', `/networks/${this.Id}`);
+    for (const key of Object.keys(response.body.Containers)) {
+      returnArray.push(response.body.Containers[key]);
+    }
+
+    return returnArray;
+  }
+
+  public async getContainersOnNetworkForService(serviceArg: DockerService) {
+    const containersOnNetwork = await this.getContainersOnNetwork();
+    const containersOfService = containersOnNetwork.filter((container) => {
+      return container.Name.startsWith(serviceArg.Spec.Name);
+    });
+    return containersOfService;
+  }
 }

ts/docker.classes.secret.ts

@@ -1,8 +1,8 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './docker.classes.host.js';
 
 // interfaces
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class DockerSecret {
   // STATIC
@@ -19,12 +19,12 @@ export class DockerSecret {
 
   public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) {
     const secrets = await this.getSecrets(dockerHostArg);
-    return secrets.find(secret => secret.ID === idArg);
+    return secrets.find((secret) => secret.ID === idArg);
   }
 
   public static async getSecretByName(dockerHostArg: DockerHost, nameArg: string) {
     const secrets = await this.getSecrets(dockerHostArg);
-    return secrets.find(secret => secret.Spec.Name === nameArg);
+    return secrets.find((secret) => secret.Spec.Name === nameArg);
   }
 
   public static async createSecret(
@@ -33,12 +33,12 @@ export class DockerSecret {
   ) {
     const labels: interfaces.TLabels = {
       ...secretDescriptor.labels,
-      version: secretDescriptor.version
+      version: secretDescriptor.version,
     };
     const response = await dockerHostArg.request('POST', '/secrets/create', {
       Name: secretDescriptor.name,
       Labels: labels,
-      Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg)
+      Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg),
     });
 
     const newSecretInstance = new DockerSecret(dockerHostArg);
@@ -76,7 +76,7 @@ export class DockerSecret {
       {
         Name: this.Spec.Name,
         Labels: this.Spec.Labels,
-        Data: plugins.smartstring.base64.encode(contentArg)
+        Data: plugins.smartstring.base64.encode(contentArg),
       }
     );
   }

ts/docker.classes.service.ts

@@ -1,9 +1,10 @@
-import * as plugins from './docker.plugins';
+import * as plugins from './docker.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { DockerHost } from './docker.classes.host';
+import { DockerHost } from './docker.classes.host.js';
-import { DockerImage } from './docker.classes.image';
+import { DockerImage } from './docker.classes.image.js';
-import { DockerSecret } from './docker.classes.secret';
+import { DockerSecret } from './docker.classes.secret.js';
+import { logger } from './docker.logging.js';
 
 export class DockerService {
   // STATIC
@@ -23,7 +24,7 @@ export class DockerService {
     networkName: string
   ): Promise<DockerService> {
     const allServices = await DockerService.getServices(dockerHost);
-    const wantedService = allServices.find(service => {
+    const wantedService = allServices.find((service) => {
       return service.Spec.Name === networkName;
     });
     return wantedService;
@@ -37,17 +38,14 @@ export class DockerService {
     serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
   ): Promise<DockerService> {
     // lets get the image
-    plugins.smartlog.defaultLogger.log(
+    logger.log('info', `now creating service ${serviceCreationDescriptor.name}`);
-      'info',
-      `now creating service ${serviceCreationDescriptor.name}`
-    );
 
     // await serviceCreationDescriptor.image.pullLatestImageFromRegistry();
     const serviceVersion = await serviceCreationDescriptor.image.getVersion();
 
     const labels: interfaces.TLabels = {
       ...serviceCreationDescriptor.labels,
-      version: serviceVersion
+      version: serviceVersion,
     };
 
     const mounts: Array<{
@@ -69,10 +67,22 @@ export class DockerService {
         Source: '/var/run/docker.sock',
         Consistency: 'default',
         ReadOnly: false,
-        Type: 'bind'
+        Type: 'bind',
       });
     }
 
+    if (serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.volumeMounts) {
+      for (const volumeMount of serviceCreationDescriptor.resources.volumeMounts) {
+        mounts.push({
+          Target: volumeMount.containerFsPath,
+          Source: volumeMount.hostFsPath,
+          Consistency: 'default',
+          ReadOnly: false,
+          Type: 'bind',
+        });
+      }
+    }
+
     const networkArray: Array<{
       Target: string;
       Aliases: string[];
@@ -81,7 +91,7 @@ export class DockerService {
     for (const network of serviceCreationDescriptor.networks) {
       networkArray.push({
         Target: network.Name,
-        Aliases: [serviceCreationDescriptor.networkAlias]
+        Aliases: [serviceCreationDescriptor.networkAlias],
       });
     }
 
@@ -92,8 +102,8 @@ export class DockerService {
       const containerPort = portArray[1];
       ports.push({
         Protocol: 'tcp',
-        PublishedPort: parseInt(containerPort, 10),
+        PublishedPort: parseInt(hostPort, 10),
-        TargetPort: parseInt(hostPort, 10)
+        TargetPort: parseInt(containerPort, 10),
       });
     }
 
@@ -105,16 +115,22 @@ export class DockerService {
           Name: 'secret.json', // TODO: make sure that works with multiple secrets
           UID: '33',
           GID: '33',
-          Mode: 384
+          Mode: 384,
         },
         SecretID: secret.ID,
-        SecretName: secret.Spec.Name
+        SecretName: secret.Spec.Name,
       });
     }
 
     // lets configure limits
+
+    const memoryLimitMB =
+      serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.memorySizeMB
+        ? serviceCreationDescriptor.resources.memorySizeMB
+        : 1000;
+
     const limits = {
-      MemoryBytes: 1000 * 1000000
+      MemoryBytes: memoryLimitMB * 1000000,
     };
 
     if (serviceCreationDescriptor.resources) {
@@ -128,25 +144,35 @@ export class DockerService {
           Image: serviceCreationDescriptor.image.RepoTags[0],
           Labels: labels,
           Secrets: secretArray,
-          Mounts: mounts
+          Mounts: mounts,
+          /* DNSConfig: {
+            Nameservers: ['1.1.1.1']
+          } */
         },
         UpdateConfig: {
           Parallelism: 0,
           Delay: 0,
           FailureAction: 'pause',
           Monitor: 15000000000,
-          MaxFailureRatio: 0.15
+          MaxFailureRatio: 0.15,
         },
         ForceUpdate: 1,
         Resources: {
-          Limits: limits
+          Limits: limits,
-        }
+        },
+        LogDriver: {
+          Name: 'json-file',
+          Options: {
+            'max-file': '3',
+            'max-size': '10M',
+          },
+        },
       },
       Labels: labels,
       Networks: networkArray,
       EndpointSpec: {
-        Ports: ports
+        Ports: ports,
-      }
+      },
     });
 
     const createdService = await DockerService.getServiceByName(
@@ -206,7 +232,7 @@ export class DockerService {
 
     await this.reReadFromDockerEngine();
     const dockerImage = await DockerImage.createFromRegistry(this.dockerHostRef, {
-      imageUrl: this.Spec.TaskTemplate.ContainerSpec.Image
+      imageUrl: this.Spec.TaskTemplate.ContainerSpec.Image,
     });
 
     const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);

ts/docker.logging.ts

@@ -0,0 +1,3 @@
+import * as plugins from './docker.plugins.js';
+
+export const logger = new plugins.smartlog.ConsoleLog();

ts/docker.plugins.ts

@@ -15,8 +15,6 @@ import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartstring from '@pushrocks/smartstring';
 import * as smartversion from '@pushrocks/smartversion';
 
-smartlog.defaultLogger.enableConsole();
-
 export {
   lik,
   smartfile,
@@ -27,9 +25,14 @@ export {
   smartpromise,
   smartrequest,
   smartstring,
-  smartversion
+  smartversion,
 };
 
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };
+
 // third party
 import * as rxjs from 'rxjs';
 

ts/index.ts

@@ -1,6 +1,6 @@
-export * from './docker.classes.host';
+export * from './docker.classes.host.js';
-export * from './docker.classes.container';
+export * from './docker.classes.container.js';
-export * from './docker.classes.image';
+export * from './docker.classes.image.js';
-export * from './docker.classes.network';
+export * from './docker.classes.network.js';
-export * from './docker.classes.secret';
+export * from './docker.classes.secret.js';
-export * from './docker.classes.service';
+export * from './docker.classes.service.js';

ts/interfaces/container.ts

@@ -1,4 +1,4 @@
-import { DockerNetwork } from '../docker.classes.network';
+import { DockerNetwork } from '../docker.classes.network.js';
 
 export interface IContainerCreationDescriptor {
   Hostname: string;

ts/interfaces/index.ts

@@ -1,7 +1,7 @@
-export * from './container';
+export * from './container.js';
-export * from './image';
+export * from './image.js';
-export * from './label';
+export * from './label.js';
-export * from './network';
+export * from './network.js';
-export * from './port';
+export * from './port.js';
-export * from './secret';
+export * from './secret.js';
-export * from './service';
+export * from './service.js';

ts/interfaces/secret.ts

@@ -1,4 +1,4 @@
-import * as interfaces from './';
+import * as interfaces from './index.js';
 
 export interface ISecretCreationDescriptor {
   name: string;

ts/interfaces/service.ts

@@ -1,7 +1,9 @@
-import * as interfaces from './';
+import * as plugins from '../docker.plugins.js';
-import { DockerNetwork } from '../docker.classes.network';
+
-import { DockerSecret } from '../docker.classes.secret';
+import * as interfaces from './index.js';
-import { DockerImage } from '../docker.classes.image';
+import { DockerNetwork } from '../docker.classes.network.js';
+import { DockerSecret } from '../docker.classes.secret.js';
+import { DockerImage } from '../docker.classes.image.js';
 
 export interface IServiceCreationDescriptor {
   name: string;
@@ -13,6 +15,7 @@ export interface IServiceCreationDescriptor {
   ports: string[];
   accessHostDockerSock?: boolean;
   resources?: {
-    memorySizeMB: number
+    memorySizeMB?: number;
+    volumeMounts?: plugins.tsclass.container.IVolumeMount[];
   };
 }

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}