Compare commits

...

6 Commits

Author SHA1 Message Date
784bb22511 1.0.81 2019-09-22 23:42:30 +02:00
71c89ac9bc fix(core): update 2019-09-22 23:42:29 +02:00
0b3e3b68c9 1.0.80 2019-09-22 17:42:29 +02:00
f3779faaaf fix(core): update 2019-09-22 17:42:28 +02:00
73476c2c39 1.0.79 2019-09-22 17:03:53 +02:00
942f65268d fix(core): update 2019-09-22 17:03:53 +02:00
6 changed files with 15 additions and 9 deletions

2
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "@mojoio/docker", "name": "@mojoio/docker",
"version": "1.0.78", "version": "1.0.81",
"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",

View File

@ -26,7 +26,8 @@ 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',
NetworkNumber: 10
}); });
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');
@ -84,7 +85,8 @@ 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, { const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
Name: 'testNetwork' Name: 'testNetwork',
NetworkNumber: 11
}); });
const testSecret = await docker.DockerSecret.createSecret(testDockerHost, { const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
name: 'testSecret', name: 'testSecret',

View File

@ -29,14 +29,14 @@ export class DockerNetwork {
Name: networkCreationDescriptor.Name, Name: networkCreationDescriptor.Name,
CheckDuplicate: true, CheckDuplicate: true,
Driver: 'overlay', Driver: 'overlay',
EnableIPv6: false, EnableIPv6: true,
IPAM: { IPAM: {
Driver: 'default', Driver: 'default',
Config: [ 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`
} }
] ]
}, },

View File

@ -128,7 +128,10 @@ 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: {
Nameservers: ['1.1.1.1']
}
}, },
UpdateConfig: { UpdateConfig: {
Parallelism: 0, Parallelism: 0,

View File

@ -3,4 +3,5 @@
*/ */
export interface INetworkCreationDescriptor { export interface INetworkCreationDescriptor {
Name: string; Name: string;
NetworkNumber: number;
} }