Compare commits

..

14 Commits

Author SHA1 Message Date
5e5bb3032c 1.0.100 2020-09-30 17:01:55 +00:00
855e18a74f fix(core): update 2020-09-30 17:01:55 +00:00
b808a93e46 1.0.99 2020-09-30 17:01:30 +00:00
a18166260e fix(core): update 2020-09-30 17:01:30 +00:00
cba8de348d 1.0.98 2020-09-30 16:56:40 +00:00
30d4a7bd24 fix(core): update 2020-09-30 16:56:39 +00:00
4ea99426fd 1.0.97 2020-09-30 16:51:04 +00:00
19309f7f45 fix(core): update 2020-09-30 16:51:03 +00:00
4e7d2fd637 1.0.96 2020-09-30 16:35:24 +00:00
1675c0c4c9 fix(core): update 2020-09-30 16:35:24 +00:00
3a4f59ef9e 1.0.95 2020-09-30 16:27:43 +00:00
90eac3e50a fix(core): update 2020-09-30 16:27:43 +00:00
edec48529d 1.0.94 2020-03-23 00:17:15 +00:00
e622b97097 fix(core): update 2020-03-23 00:17:15 +00:00
15 changed files with 9618 additions and 512 deletions

View File

@ -19,23 +19,35 @@ mirror:
stage: security stage: security
script: script:
- npmci git mirror - npmci git mirror
only:
- tags
tags: tags:
- lossless - lossless
- docker - docker
- notpriv - notpriv
audit: auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --production --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install --ignore-scripts - npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org - npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high - npmci command npm audit --audit-level=high --only=dev
tags: tags:
- lossless
- docker - docker
- notpriv allow_failure: true
# ==================== # ====================
# test stage # test stage
@ -50,9 +62,7 @@ testStable:
- npmci npm test - npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- priv
testBuild: testBuild:
stage: test stage: test
@ -63,9 +73,7 @@ testBuild:
- npmci command npm run build - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- notpriv
release: release:
stage: release stage: release
@ -85,6 +93,8 @@ release:
codequality: codequality:
stage: metadata stage: metadata
allow_failure: true allow_failure: true
only:
- tags
script: script:
- npmci command npm install -g tslint typescript - npmci command npm install -g tslint typescript
- npmci npm prepare - npmci npm prepare

View File

@ -15,7 +15,7 @@
"properties": { "properties": {
"projectType": { "projectType": {
"type": "string", "type": "string",
"enum": ["website", "element", "service", "npm"] "enum": ["website", "element", "service", "npm", "wcc"]
} }
} }
} }

9878
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,13 @@
{ {
"name": "@mojoio/docker", "name": "@mojoio/docker",
"version": "1.0.93", "version": "1.0.100",
"description": "easy communication with docker remote api from node, TypeScript ready", "description": "easy communication with docker remote api from node, TypeScript ready",
"private": false, "private": false,
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
"typings": "dist_ts/index.d.ts", "typings": "dist_ts/index.d.ts",
"scripts": { "scripts": {
"test": "tstest test/", "test": "(tstest test/ --web)",
"build": "tsbuild" "build": "(tsbuild --web)"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -27,26 +27,26 @@
}, },
"homepage": "https://gitlab.com/pushrocks/dockersock#README", "homepage": "https://gitlab.com/pushrocks/dockersock#README",
"dependencies": { "dependencies": {
"@pushrocks/lik": "^3.0.19", "@pushrocks/lik": "^4.0.17",
"@pushrocks/smartfile": "^7.0.11", "@pushrocks/smartfile": "^8.0.0",
"@pushrocks/smartjson": "^3.0.10", "@pushrocks/smartjson": "^3.0.10",
"@pushrocks/smartlog": "^2.0.21", "@pushrocks/smartlog": "^2.0.39",
"@pushrocks/smartnetwork": "^1.1.18", "@pushrocks/smartnetwork": "^1.1.22",
"@pushrocks/smartpath": "^4.0.1", "@pushrocks/smartpath": "^4.0.3",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.0.6",
"@pushrocks/smartrequest": "^1.1.47", "@pushrocks/smartrequest": "^1.1.51",
"@pushrocks/smartstring": "^3.0.18", "@pushrocks/smartstring": "^3.0.18",
"@pushrocks/smartversion": "^2.0.4", "@pushrocks/smartversion": "^2.0.4",
"@tsclass/tsclass": "^3.0.13", "@tsclass/tsclass": "^3.0.25",
"rxjs": "^6.5.4" "rxjs": "^6.6.3"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.22", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tsrun": "^1.2.8", "@gitzone/tsrun": "^1.2.12",
"@gitzone/tstest": "^1.0.28", "@gitzone/tstest": "^1.0.48",
"@pushrocks/tapbundle": "^3.2.1", "@pushrocks/tapbundle": "^3.2.9",
"@types/node": "^13.9.3", "@types/node": "^14.11.2",
"tslint": "^6.1.0", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"files": [ "files": [
@ -60,5 +60,8 @@
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

View File

@ -8,13 +8,20 @@ unofficial docker engine api abstraction package written in TypeScript
* [docs (typedoc)](https://mojoio.gitlab.io/docker/) * [docs (typedoc)](https://mojoio.gitlab.io/docker/)
## Status for master ## Status for master
[![pipeline status](https://gitlab.com/mojoio/docker/badges/master/pipeline.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) Status Category | Status Badge
[![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) GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/docker/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/docker/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/docker)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) 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 ## Usage

View File

@ -3,6 +3,12 @@ import * as docker from '../ts/index';
let testDockerHost: docker.DockerHost; let testDockerHost: docker.DockerHost;
if (process.env.CI) {
tap.test('ci placeholder', async () => {});
tap.start();
process.exit(0);
}
tap.test('should create a new Dockersock instance', async () => { tap.test('should create a new Dockersock instance', async () => {
testDockerHost = new docker.DockerHost('http://unix:/var/run/docker.sock:'); testDockerHost = new docker.DockerHost('http://unix:/var/run/docker.sock:');
return expect(testDockerHost).to.be.instanceof(docker.DockerHost); return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
@ -26,7 +32,7 @@ tap.test('should list networks', async () => {
tap.test('should create a network', async () => { tap.test('should create a network', async () => {
const newNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, { const newNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
Name: 'webgateway' Name: 'webgateway',
}); });
expect(newNetwork).to.be.instanceOf(docker.DockerNetwork); expect(newNetwork).to.be.instanceOf(docker.DockerNetwork);
expect(newNetwork.Name).to.equal('webgateway'); expect(newNetwork.Name).to.equal('webgateway');
@ -41,15 +47,15 @@ tap.test('should remove a network', async () => {
tap.test('should pull an image from imagetag', async () => { tap.test('should pull an image from imagetag', async () => {
const image = await docker.DockerImage.createFromRegistry(testDockerHost, { const image = await docker.DockerImage.createFromRegistry(testDockerHost, {
imageUrl: 'hosttoday/ht-docker-node', imageUrl: 'hosttoday/ht-docker-node',
imageTag: 'alpine' imageTag: 'alpine',
}); });
expect(image).to.be.instanceOf(docker.DockerImage); expect(image).to.be.instanceOf(docker.DockerImage);
console.log(image); 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 testObservable = await testDockerHost.getEventObservable();
const subscription = testObservable.subscribe(changeObject => { const subscription = testObservable.subscribe((changeObject) => {
console.log(changeObject); console.log(changeObject);
}); });
await tools.delayFor(2000); await tools.delayFor(2000);
@ -62,7 +68,7 @@ tap.test('should create a secret', async () => {
name: 'testSecret', name: 'testSecret',
version: '1.0.3', version: '1.0.3',
contentArg: `{ "hi": "wow"}`, contentArg: `{ "hi": "wow"}`,
labels: {} labels: {},
}); });
console.log(mySecret); console.log(mySecret);
}); });
@ -77,23 +83,23 @@ tap.test('should activate swarm mode', async () => {
await testDockerHost.activateSwarm(); await testDockerHost.activateSwarm();
}); });
tap.test('should list all services', async tools => { tap.test('should list all services', async (tools) => {
const services = await testDockerHost.getServices(); const services = await testDockerHost.getServices();
console.log(services); console.log(services);
}); });
tap.test('should create a service', async () => { tap.test('should create a service', async () => {
const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, { const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
Name: 'testNetwork' Name: 'testNetwork',
}); });
const testSecret = await docker.DockerSecret.createSecret(testDockerHost, { const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
name: 'testSecret', name: 'testSecret',
version: '0.0.1', version: '0.0.1',
labels: {}, labels: {},
contentArg: '{"hi": "wow"}' contentArg: '{"hi": "wow"}',
}); });
const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, { const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
imageUrl: 'registry.gitlab.com/hosttoday/ht-docker-static' imageUrl: 'registry.gitlab.com/hosttoday/ht-docker-static',
}); });
const testService = await docker.DockerService.createService(testDockerHost, { const testService = await docker.DockerService.createService(testDockerHost, {
image: testImage, image: testImage,
@ -102,7 +108,7 @@ tap.test('should create a service', async () => {
networks: [testNetwork], networks: [testNetwork],
networkAlias: 'testService', networkAlias: 'testService',
secrets: [testSecret], secrets: [testSecret],
ports: ['3000:80'] ports: ['3000:80'],
}); });
await testService.remove(); await testService.remove();

View File

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

View File

@ -2,6 +2,7 @@ import * as plugins from './docker.plugins';
import { DockerContainer } from './docker.classes.container'; import { DockerContainer } from './docker.classes.container';
import { DockerNetwork } from './docker.classes.network'; import { DockerNetwork } from './docker.classes.network';
import { DockerService } from './docker.classes.service'; import { DockerService } from './docker.classes.service';
import { logger } from './docker.logging';
export interface IAuthData { export interface IAuthData {
serveraddress: string; serveraddress: string;
@ -61,7 +62,7 @@ export class DockerHost {
await this.auth({ await this.auth({
username: gitlabAuthArray[0], username: gitlabAuthArray[0],
password: gitlabAuthArray[1], 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>> { public async getEventObservable(): Promise<plugins.rxjs.Observable<any>> {
const response = await this.requestStreaming('GET', '/events'); 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(); const eventString = data.toString();
try { try {
const eventObject = JSON.parse(eventString); const eventObject = JSON.parse(eventString);
@ -135,12 +136,12 @@ export class DockerHost {
DataPathPort: 4789, DataPathPort: 4789,
DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'], DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'],
SubnetSize: 24, SubnetSize: 24,
ForceNewCluster: false ForceNewCluster: false,
}); });
if (response.statusCode === 200) { if (response.statusCode === 200) {
plugins.smartlog.defaultLogger.log('info', 'created Swam succesfully'); logger.log('info', 'created Swam succesfully');
} else { } 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: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Registry-Auth': this.registryToken, 'X-Registry-Auth': this.registryToken,
Host: 'docker.sock' Host: 'docker.sock',
}, },
requestBody: dataArg, requestBody: dataArg,
keepAlive: false keepAlive: false,
}); });
if (response.statusCode !== 200) { if (response.statusCode !== 200) {
console.log(response.body); console.log(response.body);
@ -174,10 +175,10 @@ export class DockerHost {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Registry-Auth': this.registryToken, 'X-Registry-Auth': this.registryToken,
Host: 'docker.sock' Host: 'docker.sock',
}, },
requestBody: null, requestBody: null,
keepAlive: false keepAlive: false,
}, },
true true
); );

View File

@ -1,6 +1,7 @@
import * as plugins from './docker.plugins'; import * as plugins from './docker.plugins';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces';
import { DockerHost } from './docker.classes.host'; import { DockerHost } from './docker.classes.host';
import { logger } from './docker.logging';
export class DockerImage { export class DockerImage {
// STATIC // STATIC
@ -15,7 +16,7 @@ export class DockerImage {
public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) { public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
const images = await this.getImages(dockerHost); const images = await this.getImages(dockerHost);
const result = images.find(image => { const result = images.find((image) => {
if (image.RepoTags) { if (image.RepoTags) {
return image.RepoTags.includes(imageNameArg); return image.RepoTags.includes(imageNameArg);
} else { } else {
@ -37,7 +38,7 @@ export class DockerImage {
} = { } = {
imageUrl: creationObject.imageUrl, imageUrl: creationObject.imageUrl,
imageTag: creationObject.imageTag, imageTag: creationObject.imageTag,
imageOriginTag: null imageOriginTag: null,
}; };
if (imageUrlObject.imageUrl.includes(':')) { if (imageUrlObject.imageUrl.includes(':')) {
const imageUrl = imageUrlObject.imageUrl.split(':')[0]; const imageUrl = imageUrlObject.imageUrl.split(':')[0];
@ -63,14 +64,11 @@ export class DockerImage {
)}&tag=${encodeURIComponent(imageUrlObject.imageTag)}` )}&tag=${encodeURIComponent(imageUrlObject.imageTag)}`
); );
if (response.statusCode < 300) { 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); const image = await DockerImage.findImageByName(dockerHostArg, imageUrlObject.imageOriginTag);
return image; return image;
} else { } 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) { constructor(dockerHostArg, dockerImageObjectArg: any) {
this.dockerHost = dockerHostArg; this.dockerHost = dockerHostArg;
Object.keys(dockerImageObjectArg).forEach(keyArg => { Object.keys(dockerImageObjectArg).forEach((keyArg) => {
this[keyArg] = dockerImageObjectArg[keyArg]; this[keyArg] = dockerImageObjectArg[keyArg];
}); });
} }
@ -128,7 +126,7 @@ export class DockerImage {
*/ */
public async pullLatestImageFromRegistry(): Promise<boolean> { public async pullLatestImageFromRegistry(): Promise<boolean> {
const updatedImage = await DockerImage.createFromRegistry(this.dockerHost, { const updatedImage = await DockerImage.createFromRegistry(this.dockerHost, {
imageUrl: this.RepoTags[0] imageUrl: this.RepoTags[0],
}); });
Object.assign(this, updatedImage); Object.assign(this, updatedImage);
// TODO: Compare image digists before and after // TODO: Compare image digists before and after

View File

@ -3,6 +3,7 @@ import * as interfaces from './interfaces';
import { DockerHost } from './docker.classes.host'; import { DockerHost } from './docker.classes.host';
import { DockerService } from './docker.classes.service'; import { DockerService } from './docker.classes.service';
import { logger } from './docker.logging';
export class DockerNetwork { export class DockerNetwork {
public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> { public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> {
@ -18,7 +19,7 @@ export class DockerNetwork {
public static async getNetworkByName(dockerHost: DockerHost, dockerNetworkNameArg: string) { public static async getNetworkByName(dockerHost: DockerHost, dockerNetworkNameArg: string) {
const networks = await DockerNetwork.getNetworks(dockerHost); const networks = await DockerNetwork.getNetworks(dockerHost);
return networks.find(dockerNetwork => dockerNetwork.Name === dockerNetworkNameArg); return networks.find((dockerNetwork) => dockerNetwork.Name === dockerNetworkNameArg);
} }
public static async createNetwork( public static async createNetwork(
@ -42,16 +43,13 @@ export class DockerNetwork {
}, */ }, */
Internal: false, Internal: false,
Attachable: true, Attachable: true,
Ingress: false Ingress: false,
}); });
if (response.statusCode < 300) { 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); return await DockerNetwork.getNetworkByName(dockerHost, networkCreationDescriptor.Name);
} else { } 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; return null;
} }
} }
@ -112,7 +110,7 @@ export class DockerNetwork {
public async getContainersOnNetworkForService(serviceArg: DockerService) { public async getContainersOnNetworkForService(serviceArg: DockerService) {
const containersOnNetwork = await this.getContainersOnNetwork(); const containersOnNetwork = await this.getContainersOnNetwork();
const containersOfService = containersOnNetwork.filter(container => { const containersOfService = containersOnNetwork.filter((container) => {
return container.Name.startsWith(serviceArg.Spec.Name); return container.Name.startsWith(serviceArg.Spec.Name);
}); });
return containersOfService; return containersOfService;

View File

@ -19,12 +19,12 @@ export class DockerSecret {
public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) { public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) {
const secrets = await this.getSecrets(dockerHostArg); 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) { public static async getSecretByName(dockerHostArg: DockerHost, nameArg: string) {
const secrets = await this.getSecrets(dockerHostArg); 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( public static async createSecret(
@ -33,12 +33,12 @@ export class DockerSecret {
) { ) {
const labels: interfaces.TLabels = { const labels: interfaces.TLabels = {
...secretDescriptor.labels, ...secretDescriptor.labels,
version: secretDescriptor.version version: secretDescriptor.version,
}; };
const response = await dockerHostArg.request('POST', '/secrets/create', { const response = await dockerHostArg.request('POST', '/secrets/create', {
Name: secretDescriptor.name, Name: secretDescriptor.name,
Labels: labels, Labels: labels,
Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg) Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg),
}); });
const newSecretInstance = new DockerSecret(dockerHostArg); const newSecretInstance = new DockerSecret(dockerHostArg);
@ -76,7 +76,7 @@ export class DockerSecret {
{ {
Name: this.Spec.Name, Name: this.Spec.Name,
Labels: this.Spec.Labels, Labels: this.Spec.Labels,
Data: plugins.smartstring.base64.encode(contentArg) Data: plugins.smartstring.base64.encode(contentArg),
} }
); );
} }

View File

@ -4,6 +4,7 @@ import * as interfaces from './interfaces';
import { DockerHost } from './docker.classes.host'; import { DockerHost } from './docker.classes.host';
import { DockerImage } from './docker.classes.image'; import { DockerImage } from './docker.classes.image';
import { DockerSecret } from './docker.classes.secret'; import { DockerSecret } from './docker.classes.secret';
import { logger } from './docker.logging';
export class DockerService { export class DockerService {
// STATIC // STATIC
@ -23,7 +24,7 @@ export class DockerService {
networkName: string networkName: string
): Promise<DockerService> { ): Promise<DockerService> {
const allServices = await DockerService.getServices(dockerHost); const allServices = await DockerService.getServices(dockerHost);
const wantedService = allServices.find(service => { const wantedService = allServices.find((service) => {
return service.Spec.Name === networkName; return service.Spec.Name === networkName;
}); });
return wantedService; return wantedService;
@ -37,17 +38,14 @@ export class DockerService {
serviceCreationDescriptor: interfaces.IServiceCreationDescriptor serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
): Promise<DockerService> { ): Promise<DockerService> {
// lets get the image // 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(); // await serviceCreationDescriptor.image.pullLatestImageFromRegistry();
const serviceVersion = await serviceCreationDescriptor.image.getVersion(); const serviceVersion = await serviceCreationDescriptor.image.getVersion();
const labels: interfaces.TLabels = { const labels: interfaces.TLabels = {
...serviceCreationDescriptor.labels, ...serviceCreationDescriptor.labels,
version: serviceVersion version: serviceVersion,
}; };
const mounts: Array<{ const mounts: Array<{
@ -69,18 +67,18 @@ export class DockerService {
Source: '/var/run/docker.sock', Source: '/var/run/docker.sock',
Consistency: 'default', Consistency: 'default',
ReadOnly: false, ReadOnly: false,
Type: 'bind' Type: 'bind',
}); });
} }
if (serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.volumeMounts) { if (serviceCreationDescriptor.resources && serviceCreationDescriptor.resources.volumeMounts) {
for(const volumeMount of serviceCreationDescriptor.resources.volumeMounts) { for (const volumeMount of serviceCreationDescriptor.resources.volumeMounts) {
mounts.push({ mounts.push({
Target: volumeMount.containerFsPath, Target: volumeMount.containerFsPath,
Source: volumeMount.hostFsPath, Source: volumeMount.hostFsPath,
Consistency: 'default', Consistency: 'default',
ReadOnly: false, ReadOnly: false,
Type: 'bind' Type: 'bind',
}); });
} }
} }
@ -93,7 +91,7 @@ export class DockerService {
for (const network of serviceCreationDescriptor.networks) { for (const network of serviceCreationDescriptor.networks) {
networkArray.push({ networkArray.push({
Target: network.Name, Target: network.Name,
Aliases: [serviceCreationDescriptor.networkAlias] Aliases: [serviceCreationDescriptor.networkAlias],
}); });
} }
@ -105,7 +103,7 @@ export class DockerService {
ports.push({ ports.push({
Protocol: 'tcp', Protocol: 'tcp',
PublishedPort: parseInt(hostPort, 10), PublishedPort: parseInt(hostPort, 10),
TargetPort: parseInt(containerPort, 10) TargetPort: parseInt(containerPort, 10),
}); });
} }
@ -117,10 +115,10 @@ export class DockerService {
Name: 'secret.json', // TODO: make sure that works with multiple secrets Name: 'secret.json', // TODO: make sure that works with multiple secrets
UID: '33', UID: '33',
GID: '33', GID: '33',
Mode: 384 Mode: 384,
}, },
SecretID: secret.ID, SecretID: secret.ID,
SecretName: secret.Spec.Name SecretName: secret.Spec.Name,
}); });
} }
@ -132,7 +130,7 @@ export class DockerService {
: 1000; : 1000;
const limits = { const limits = {
MemoryBytes: memoryLimitMB * 1000000 MemoryBytes: memoryLimitMB * 1000000,
}; };
if (serviceCreationDescriptor.resources) { if (serviceCreationDescriptor.resources) {
@ -146,7 +144,7 @@ export class DockerService {
Image: serviceCreationDescriptor.image.RepoTags[0], Image: serviceCreationDescriptor.image.RepoTags[0],
Labels: labels, Labels: labels,
Secrets: secretArray, Secrets: secretArray,
Mounts: mounts Mounts: mounts,
/* DNSConfig: { /* DNSConfig: {
Nameservers: ['1.1.1.1'] Nameservers: ['1.1.1.1']
} */ } */
@ -156,25 +154,25 @@ export class DockerService {
Delay: 0, Delay: 0,
FailureAction: 'pause', FailureAction: 'pause',
Monitor: 15000000000, Monitor: 15000000000,
MaxFailureRatio: 0.15 MaxFailureRatio: 0.15,
}, },
ForceUpdate: 1, ForceUpdate: 1,
Resources: { Resources: {
Limits: limits Limits: limits,
}, },
LogDriver: { LogDriver: {
Name: 'json-file', Name: 'json-file',
Options: { Options: {
'max-file': '3', 'max-file': '3',
'max-size': '10M' 'max-size': '10M',
} },
} },
}, },
Labels: labels, Labels: labels,
Networks: networkArray, Networks: networkArray,
EndpointSpec: { EndpointSpec: {
Ports: ports Ports: ports,
} },
}); });
const createdService = await DockerService.getServiceByName( const createdService = await DockerService.getServiceByName(
@ -234,7 +232,7 @@ export class DockerService {
await this.reReadFromDockerEngine(); await this.reReadFromDockerEngine();
const dockerImage = await DockerImage.createFromRegistry(this.dockerHostRef, { 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); const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);

3
ts/docker.logging.ts Normal file
View File

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

View File

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

View File

@ -16,6 +16,6 @@ export interface IServiceCreationDescriptor {
accessHostDockerSock?: boolean; accessHostDockerSock?: boolean;
resources?: { resources?: {
memorySizeMB?: number; memorySizeMB?: number;
volumeMounts: plugins.tsclass.container.IVolumeMount[] volumeMounts?: plugins.tsclass.container.IVolumeMount[];
}; };
} }