Compare commits

...

6 Commits

Author SHA1 Message Date
e50b028c00 1.0.32 2019-08-14 14:19:46 +02:00
867dda8e7c fix(core): update 2019-08-14 14:19:45 +02:00
d12d595f21 1.0.31 2019-01-18 02:42:13 +01:00
6117228ea4 fix(core): update 2019-01-18 02:42:13 +01:00
b6b584f808 1.0.30 2019-01-10 00:43:46 +01:00
48fe6ce0a8 fix(core): update 2019-01-10 00:43:45 +01:00
11 changed files with 617 additions and 384 deletions

View File

@ -65,6 +65,8 @@ sast:
testSTABLE:
image: hosttoday/ht-docker-dbase:npmci
services:
- docker:dind
stage: test
script:
- npmci npm prepare

888
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "@mojoio/docker",
"version": "1.0.29",
"version": "1.0.32",
"description": "easy communication with docker remote api from node, TypeScript ready",
"private": false,
"main": "dist/index.js",
@ -27,19 +27,19 @@
},
"homepage": "https://gitlab.com/pushrocks/dockersock#README",
"dependencies": {
"@pushrocks/lik": "^3.0.4",
"@pushrocks/smartlog": "^2.0.9",
"@pushrocks/smartpromise": "^2.0.5",
"@pushrocks/smartrequest": "^1.1.14",
"rxjs": "^6.3.3"
"@pushrocks/lik": "^3.0.10",
"@pushrocks/smartlog": "^2.0.19",
"@pushrocks/smartpromise": "^3.0.2",
"@pushrocks/smartrequest": "^1.1.16",
"rxjs": "^6.5.2"
},
"devDependencies": {
"@gitzone/tsbuild": "^2.1.4",
"@gitzone/tsrun": "^1.1.17",
"@gitzone/tstest": "^1.0.18",
"@pushrocks/tapbundle": "^3.0.7",
"@types/node": "^10.12.18",
"tslint": "^5.12.0",
"tslint-config-prettier": "^1.17.0"
"@gitzone/tsbuild": "^2.1.11",
"@gitzone/tsrun": "^1.2.8",
"@gitzone/tstest": "^1.0.24",
"@pushrocks/tapbundle": "^3.0.11",
"@types/node": "^12.7.1",
"tslint": "^5.18.0",
"tslint-config-prettier": "^1.18.0"
}
}

View File

@ -11,9 +11,11 @@ export class DockerContainer {
/**
* get all containers
*/
static async getContainers(dockerHostArg: DockerHost): Promise<DockerContainer[]> {
public static async getContainers(dockerHostArg: DockerHost): Promise<DockerContainer[]> {
const result: DockerContainer[] = [];
const response = await dockerHostArg.request('GET', '/containers/json');
// TODO: Think about getting the config by inpsecting the container
for (const containerResult of response.body) {
result.push(new DockerContainer(containerResult));
}
@ -21,11 +23,17 @@ export class DockerContainer {
}
/**
*
* gets an container by Id
* @param containerId
*/
static async getContainerById(containerId: string) {}
static async create() {}
public static async getContainerById(containerId: string) {}
/**
* create a container
*/
public static async create(creationSpecifier: interfaces.IContainerCreationSpecifier) {
}
// ========
// INSTANCE

View File

@ -43,7 +43,13 @@ export class DockerHost {
const response = await this.requestStreaming('GET', '/events');
return plugins.rxjs.Observable.create(observer => {
response.on('data', data => {
observer.next(data.toString());
const eventString = data.toString();
try {
const eventObject = JSON.parse(eventString);
observer.next(eventObject);
} catch (e) {
console.log(e);
}
});
return () => {
response.emit('end');

View File

@ -2,13 +2,36 @@ import * as plugins from './dockersock.plugins';
import { DockerHost } from './docker.classes.host';
export class DockerImage {
// STATIC
public static async createFromRegistry(dockerHostArg: DockerHost, dockerImageTag): Promise<DockerImage> {
const resultingImage = new DockerImage();
return resultingImage;
}
public static async createFromExistingImage(dockerHostArg: DockerHost, dockerImageTag) {}
// INSTANCE
/**
* the tags for an image
*/
tags: string[] = [];
public tags: string[] = [];
static async createFromRegsitry(dockerHostArg: DockerHost): Promise<DockerImage> {
const resultingImage = new DockerImage();
return resultingImage;
/**
* returns a boolean wether the image has a upstream image
*/
public isUpstreamImage (): boolean {
// TODO: implement isUpastreamImage
return true;
};
/**
*
*/
public async pullLatestImageFromRegistry() : Promise<boolean> {
// TODO: implement pullLatestImageFromRegistry
return true;
}
}

View File

@ -0,0 +1,8 @@
import * as plugins from './dockersock.plugins';
import * as interfaces from './interfaces';
import { DockerHost } from './docker.classes.host';
export class DockerNetwork {
}

View File

@ -0,0 +1,8 @@
import * as plugins from './dockersock.plugins';
import * as interfaces from './interfaces';
import { DockerHost } from './docker.classes.host';
export class DockerService {
}

View File

@ -1 +1,5 @@
export { DockerHost } from './docker.classes.host';
export * from './docker.classes.host';
export * from './docker.classes.container';
export * from './docker.classes.image';
export * from './docker.classes.network';
export * from './docker.classes.service';

View File

@ -0,0 +1,7 @@
import { DockerNetwork } from '../docker.classes.network';
export interface IContainerCreationSpecifier {
hostname: string;
domainName: string;
networks?: DockerNetwork[];
}

View File

@ -1,2 +1,3 @@
export * from './container';
export * from './label';
export * from './port';