Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
546e139b46 | |||
28d70bb49f | |||
b71f134abd | |||
968b3c7449 |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.55",
|
"version": "1.0.57",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mojoio/docker",
|
"name": "@mojoio/docker",
|
||||||
"version": "1.0.55",
|
"version": "1.0.57",
|
||||||
"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",
|
||||||
|
@ -107,7 +107,7 @@ export class DockerService {
|
|||||||
public UpdatedAt: string;
|
public UpdatedAt: string;
|
||||||
public Spec: {
|
public Spec: {
|
||||||
Name: string;
|
Name: string;
|
||||||
Labels: interfaces.TLabels; // ZBD
|
Labels: interfaces.TLabels;
|
||||||
TaskTemplate: {
|
TaskTemplate: {
|
||||||
ContainerSpec: {
|
ContainerSpec: {
|
||||||
Image: string;
|
Image: string;
|
||||||
@ -142,7 +142,7 @@ export class DockerService {
|
|||||||
|
|
||||||
const dockerData = await this.dockerHostRef.request(
|
const dockerData = await this.dockerHostRef.request(
|
||||||
'POST',
|
'POST',
|
||||||
`/services/${this.ID}/update?version=${this.Version.Index + 1}`,
|
`/services/${this.ID}/update?version=${this.Version.Index}`,
|
||||||
{
|
{
|
||||||
Name: this.Spec.Name,
|
Name: this.Spec.Name,
|
||||||
TaskTemplate: this.Spec.TaskTemplate,
|
TaskTemplate: this.Spec.TaskTemplate,
|
||||||
@ -162,7 +162,7 @@ export class DockerService {
|
|||||||
Object.assign(this, dockerData);
|
Object.assign(this, dockerData);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async updateFromRegistry() {
|
public async needsUpdate(): Promise<boolean> {
|
||||||
// TODO: implement digest based update recognition
|
// TODO: implement digest based update recognition
|
||||||
|
|
||||||
await this.reReadFromDockerEngine();
|
await this.reReadFromDockerEngine();
|
||||||
@ -173,7 +173,15 @@ export class DockerService {
|
|||||||
const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);
|
const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);
|
||||||
const serviceVersion = new plugins.smartversion.SmartVersion(this.Spec.Labels.version);
|
const serviceVersion = new plugins.smartversion.SmartVersion(this.Spec.Labels.version);
|
||||||
if (imageVersion.greaterThan(serviceVersion)) {
|
if (imageVersion.greaterThan(serviceVersion)) {
|
||||||
console.log('service needs to be updated');
|
console.log(`service ${this.Spec.Name} needs to be updated`);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
console.log(`service ${this.Spec.Name} is up to date.`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async updateFromRegistry() {
|
||||||
|
if (await this.needsUpdate()) {
|
||||||
this.update();
|
this.update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user