Compare commits

..

2 Commits

Author SHA1 Message Date
5cf80944fe 1.0.73 2019-09-19 20:05:57 +02:00
cdb69c5f17 fix(core): update 2019-09-19 20:05:56 +02:00
4 changed files with 20 additions and 4 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@mojoio/docker",
"version": "1.0.72",
"version": "1.0.73",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "@mojoio/docker",
"version": "1.0.72",
"version": "1.0.73",
"description": "easy communication with docker remote api from node, TypeScript ready",
"private": false,
"main": "dist/index.js",

View File

@ -97,11 +97,12 @@ export class DockerService {
});
}
// lets configure secrets
const secretArray: any[] = [];
for (const secret of serviceCreationDescriptor.secrets) {
secretArray.push({
File: {
Name: 'secret.json',
Name: 'secret.json', // TODO: make sure that works with multiple secrets
UID: '33',
GID: '33',
Mode: 384
@ -111,6 +112,15 @@ export class DockerService {
});
}
// lets configure limits
const limits = {
MemoryBytes: 1000 * 1000000
};
if (serviceCreationDescriptor.resources) {
limits.MemoryBytes = serviceCreationDescriptor.resources.memorySizeMB * 1000000;
}
const response = await dockerHost.request('POST', '/services/create', {
Name: serviceCreationDescriptor.name,
TaskTemplate: {
@ -127,7 +137,10 @@ export class DockerService {
Monitor: 15000000000,
MaxFailureRatio: 0.15
},
ForceUpdate: 1
ForceUpdate: 1,
Resources: {
Limits: limits
}
},
Labels: labels,
Networks: networkArray,

View File

@ -12,4 +12,7 @@ export interface IServiceCreationDescriptor {
secrets: DockerSecret[];
ports: string[];
accessHostDockerSock?: boolean;
resources?: {
memorySizeMB: number
};
}