fix(core): update
This commit is contained in:
parent
b5c4727bae
commit
424e911804
676
package-lock.json
generated
676
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
15
package.json
15
package.json
@ -27,19 +27,20 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/dockersock#README",
|
"homepage": "https://gitlab.com/pushrocks/dockersock#README",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/lik": "^3.0.10",
|
"@pushrocks/lik": "^3.0.11",
|
||||||
"@pushrocks/smartlog": "^2.0.19",
|
"@pushrocks/smartlog": "^2.0.19",
|
||||||
|
"@pushrocks/smartnetwork": "^1.1.14",
|
||||||
"@pushrocks/smartpromise": "^3.0.2",
|
"@pushrocks/smartpromise": "^3.0.2",
|
||||||
"@pushrocks/smartrequest": "^1.1.16",
|
"@pushrocks/smartrequest": "^1.1.23",
|
||||||
"rxjs": "^6.5.2"
|
"rxjs": "^6.5.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.11",
|
"@gitzone/tsbuild": "^2.1.17",
|
||||||
"@gitzone/tsrun": "^1.2.8",
|
"@gitzone/tsrun": "^1.2.8",
|
||||||
"@gitzone/tstest": "^1.0.24",
|
"@gitzone/tstest": "^1.0.24",
|
||||||
"@pushrocks/tapbundle": "^3.0.11",
|
"@pushrocks/tapbundle": "^3.0.13",
|
||||||
"@types/node": "^12.7.1",
|
"@types/node": "^12.7.4",
|
||||||
"tslint": "^5.18.0",
|
"tslint": "^5.19.0",
|
||||||
"tslint-config-prettier": "^1.18.0"
|
"tslint-config-prettier": "^1.18.0"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
|
@ -9,6 +9,10 @@ tap.test('should create a new Dockersock instance', async () => {
|
|||||||
return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
|
return expect(testDockerHost).to.be.instanceof(docker.DockerHost);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
tap.test('should create a docker swarm', async () => {
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
// Containers
|
// Containers
|
||||||
tap.test('should list containers', async () => {
|
tap.test('should list containers', async () => {
|
||||||
const containers = await testDockerHost.getContainers();
|
const containers = await testDockerHost.getContainers();
|
||||||
|
@ -29,9 +29,12 @@ export class DockerHost {
|
|||||||
* @param userArg
|
* @param userArg
|
||||||
* @param passArg
|
* @param passArg
|
||||||
*/
|
*/
|
||||||
public async auth(registryArg: string, userArg: string, passArg: string) {
|
public async auth(registryUrl: string, userArg: string, passArg: string) {
|
||||||
// TODO: implement Docker Registry authentication
|
const response = await this.request('POST', '/auth', {
|
||||||
await this.request('POST', '');
|
serveraddress: registryUrl,
|
||||||
|
username: userArg,
|
||||||
|
password: passArg,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -74,9 +77,21 @@ export class DockerHost {
|
|||||||
* activates docker swarm
|
* activates docker swarm
|
||||||
*/
|
*/
|
||||||
public async activateSwarm(addvertisementIpArg?: string) {
|
public async activateSwarm(addvertisementIpArg?: string) {
|
||||||
|
// determine advertisement address
|
||||||
|
let addvertisementIp: string;
|
||||||
|
if (addvertisementIpArg) {
|
||||||
|
addvertisementIp = addvertisementIpArg;
|
||||||
|
} else {
|
||||||
|
const smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
|
||||||
|
const defaultGateway = await smartnetworkInstance.getDefaultGateway();
|
||||||
|
if (defaultGateway) {
|
||||||
|
addvertisementIp = defaultGateway.ipv4.address;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const response = await this.request('POST', '/swarm/init', {
|
const response = await this.request('POST', '/swarm/init', {
|
||||||
ListenAddr: '0.0.0.0:2377',
|
ListenAddr: '0.0.0.0:2377',
|
||||||
AdvertiseAddr: addvertisementIpArg ? `${addvertisementIpArg}:2377` : undefined,
|
AdvertiseAddr: addvertisementIp,
|
||||||
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,
|
||||||
|
@ -58,6 +58,6 @@ export class DockerService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
// TODO: implemnt updating service
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
// @pushrocks scope
|
// @pushrocks scope
|
||||||
import * as lik from '@pushrocks/lik';
|
import * as lik from '@pushrocks/lik';
|
||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as smartlog from '@pushrocks/smartlog';
|
||||||
|
import * as smartnetwork from '@pushrocks/smartnetwork';
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
import * as smartrequest from '@pushrocks/smartrequest';
|
import * as smartrequest from '@pushrocks/smartrequest';
|
||||||
|
|
||||||
smartlog.defaultLogger.enableConsole();
|
smartlog.defaultLogger.enableConsole();
|
||||||
|
|
||||||
export { lik, smartlog, smartpromise, smartrequest };
|
export { lik, smartlog, smartnetwork, smartpromise, smartrequest };
|
||||||
|
|
||||||
// third party
|
// third party
|
||||||
import * as rxjs from 'rxjs';
|
import * as rxjs from 'rxjs';
|
||||||
|
Loading…
Reference in New Issue
Block a user