Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
846ea9997e | |||
de54db33ad | |||
314cb692ac | |||
73f8ded3fe |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.44",
|
"version": "1.0.46",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.44",
|
"version": "1.0.46",
|
||||||
"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/index.js",
|
"main": "dist/index.js",
|
||||||
|
@ -64,12 +64,17 @@ tap.test('should list all services', async tools => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should create a service', async () => {
|
tap.test('should create a service', async () => {
|
||||||
|
const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
|
||||||
|
Name: 'testNetwork'
|
||||||
|
});
|
||||||
await DockerService.createService(testDockerHost, {
|
await DockerService.createService(testDockerHost, {
|
||||||
Image: 'nginx',
|
Image: 'nginx:latest',
|
||||||
Labels: {
|
Labels: {
|
||||||
'testlabel': 'hi'
|
'testlabel': 'hi'
|
||||||
},
|
},
|
||||||
Name: 'testService'
|
Name: 'testService',
|
||||||
|
networks: [testNetwork],
|
||||||
|
networkAlias: 'testService'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,6 +47,8 @@ export class DockerImage {
|
|||||||
} else {
|
} else {
|
||||||
imageUrlObject.imageTag = imageTag;
|
imageUrlObject.imageTag = imageTag;
|
||||||
}
|
}
|
||||||
|
} else if (!imageUrlObject.imageTag) {
|
||||||
|
imageUrlObject.imageTag = 'latest';
|
||||||
}
|
}
|
||||||
imageUrlObject.imageOriginTag = `${imageUrlObject.imageUrl}:${imageUrlObject.imageTag}`;
|
imageUrlObject.imageOriginTag = `${imageUrlObject.imageUrl}:${imageUrlObject.imageTag}`;
|
||||||
|
|
||||||
|
@ -23,10 +23,19 @@ export class DockerService {
|
|||||||
serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
|
serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
|
||||||
) {
|
) {
|
||||||
// lets get the image
|
// lets get the image
|
||||||
DockerImage.createFromRegistry(dockerHost, {
|
plugins.smartlog.defaultLogger.log('info', `downloading image for service ${serviceCreationDescriptor.Name}`);
|
||||||
|
const serviceImage = await DockerImage.createFromRegistry(dockerHost, {
|
||||||
imageUrl: serviceCreationDescriptor.Image
|
imageUrl: serviceCreationDescriptor.Image
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const networkArray: any[] = [];
|
||||||
|
for (const network of serviceCreationDescriptor.networks) {
|
||||||
|
networkArray.push({
|
||||||
|
Target: network.Name,
|
||||||
|
Aliases: [serviceCreationDescriptor.networkAlias]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
dockerHost.request('POST', '/services/create', {
|
dockerHost.request('POST', '/services/create', {
|
||||||
Name: serviceCreationDescriptor.Name,
|
Name: serviceCreationDescriptor.Name,
|
||||||
TaskTemplate: {
|
TaskTemplate: {
|
||||||
@ -35,7 +44,8 @@ export class DockerService {
|
|||||||
Labels: serviceCreationDescriptor.Labels
|
Labels: serviceCreationDescriptor.Labels
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Labels: serviceCreationDescriptor.Labels
|
Labels: serviceCreationDescriptor.Labels,
|
||||||
|
Networks: networkArray
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
import * as interfaces from './';
|
import * as interfaces from './';
|
||||||
|
import { DockerNetwork } from '../docker.classes.network';
|
||||||
|
|
||||||
export interface IServiceCreationDescriptor {
|
export interface IServiceCreationDescriptor {
|
||||||
Name: string;
|
Name: string;
|
||||||
Image: string;
|
Image: string;
|
||||||
Labels: interfaces.TLabels;
|
Labels: interfaces.TLabels;
|
||||||
|
networks: DockerNetwork[];
|
||||||
|
networkAlias: string;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user