Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
de2d7e647b | |||
d9348bd016 | |||
034fbc3994 | |||
a33a6a1f7f | |||
9dd403821b | |||
601d82ea74 | |||
784bb22511 | |||
71c89ac9bc | |||
0b3e3b68c9 | |||
f3779faaaf | |||
73476c2c39 | |||
942f65268d |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.78",
|
"version": "1.0.84",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.78",
|
"version": "1.0.84",
|
||||||
"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",
|
||||||
|
@ -140,7 +140,7 @@ export class DockerImage {
|
|||||||
if (this.Labels && this.Labels.version) {
|
if (this.Labels && this.Labels.version) {
|
||||||
return this.Labels.version;
|
return this.Labels.version;
|
||||||
} else {
|
} else {
|
||||||
return 'x.x.x';
|
return '0.0.0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,17 +30,17 @@ export class DockerNetwork {
|
|||||||
CheckDuplicate: true,
|
CheckDuplicate: true,
|
||||||
Driver: 'overlay',
|
Driver: 'overlay',
|
||||||
EnableIPv6: false,
|
EnableIPv6: false,
|
||||||
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`
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
}, */
|
||||||
Internal: true,
|
Internal: false,
|
||||||
Attachable: true,
|
Attachable: true,
|
||||||
Ingress: false
|
Ingress: false
|
||||||
});
|
});
|
||||||
|
@ -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,
|
||||||
|
Reference in New Issue
Block a user