fix(core): update
This commit is contained in:
parent
fe3560caac
commit
020737e21b
@ -53,4 +53,4 @@
|
||||
"npmextra.json",
|
||||
"readme.md"
|
||||
]
|
||||
}
|
||||
}
|
@ -49,7 +49,10 @@ export class DockerContainer {
|
||||
if (response.statusCode < 300) {
|
||||
plugins.smartlog.defaultLogger.log('info', 'Container created successfully');
|
||||
} else {
|
||||
plugins.smartlog.defaultLogger.log('error', 'There has been a problem when creating the container');
|
||||
plugins.smartlog.defaultLogger.log(
|
||||
'error',
|
||||
'There has been a problem when creating the container'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -68,7 +68,7 @@ export class DockerHost {
|
||||
public async activateSwarm(addvertisementIpArg?: string) {
|
||||
const response = await this.request('POST', '/swarm/init', {
|
||||
ListenAddr: '0.0.0.0:2377',
|
||||
AdvertiseAddr: addvertisementIpArg ? `${addvertisementIpArg}:2377`: undefined,
|
||||
AdvertiseAddr: addvertisementIpArg ? `${addvertisementIpArg}:2377` : undefined,
|
||||
DataPathPort: 4789,
|
||||
DefaultAddrPool: ['10.10.0.0/8', '20.20.0.0/8'],
|
||||
SubnetSize: 24,
|
||||
|
@ -13,7 +13,7 @@ export class DockerImage {
|
||||
return images;
|
||||
}
|
||||
|
||||
public static async findImageByName (dockerHost: DockerHost, imageNameArg: string) {
|
||||
public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
|
||||
const images = await this.getImages(dockerHost);
|
||||
return images.find(image => {
|
||||
return image.RepoTags.includes(imageNameArg);
|
||||
@ -36,7 +36,7 @@ export class DockerImage {
|
||||
`Successfully pulled image ${creationObject.imageUrl} from the registry`
|
||||
);
|
||||
const originTag = `${creationObject.imageUrl}:${creationObject.tag}`;
|
||||
console.log(originTag)
|
||||
console.log(originTag);
|
||||
const image = await DockerImage.findImageByName(dockerHostArg, originTag);
|
||||
return image;
|
||||
} else {
|
||||
@ -93,9 +93,7 @@ export class DockerImage {
|
||||
return this.RepoTags.length > 0;
|
||||
}
|
||||
|
||||
public tagImage(newTag) {
|
||||
|
||||
}
|
||||
public tagImage(newTag) {}
|
||||
|
||||
/**
|
||||
* pulls the latest version from the registry
|
||||
@ -111,6 +109,4 @@ export class DockerImage {
|
||||
// TODO: Compare image digists before and after
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -41,12 +41,15 @@ export class DockerNetwork {
|
||||
Attachable: true,
|
||||
Ingress: false
|
||||
});
|
||||
if (response.statusCode < 300 ) {
|
||||
if (response.statusCode < 300) {
|
||||
plugins.smartlog.defaultLogger.log('info', 'Created network successfully');
|
||||
return await DockerNetwork.getNetworkByName(dockerHost, networkCreationDescriptor.Name);
|
||||
} else {
|
||||
plugins.smartlog.defaultLogger.log('error', 'There has been an error creating the wanted network');
|
||||
return null
|
||||
plugins.smartlog.defaultLogger.log(
|
||||
'error',
|
||||
'There has been an error creating the wanted network'
|
||||
);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -14,11 +14,13 @@ export class DockerService {
|
||||
return services;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* creates a service
|
||||
*/
|
||||
public static async createService(dockerHost: DockerHost, serviceCreationDescriptor: interfaces.IServiceCreationDescriptor) {
|
||||
public static async createService(
|
||||
dockerHost: DockerHost,
|
||||
serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
|
||||
) {
|
||||
dockerHost.request('POST', '/services/create', {
|
||||
Name: serviceCreationDescriptor.Name,
|
||||
TaskTemplate: {
|
||||
|
@ -1,4 +1,4 @@
|
||||
export interface IImageCreationDescriptor {
|
||||
imageUrl: string;
|
||||
tag: string;
|
||||
}
|
||||
}
|
||||
|
@ -4,4 +4,3 @@ export * from './label';
|
||||
export * from './network';
|
||||
export * from './port';
|
||||
export * from './service';
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
import * as interfaces from './'
|
||||
import * as interfaces from './';
|
||||
|
||||
export interface IServiceCreationDescriptor {
|
||||
Name: string;
|
||||
Image: string;
|
||||
Labels: interfaces.TLabels;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user