fix(core): update

This commit is contained in:
Philipp Kunz 2019-09-01 13:51:11 +02:00
parent 6ab5e9cb30
commit 4cf7aea374
5 changed files with 16 additions and 17 deletions

View File

@ -18,7 +18,6 @@ stages:
mirror: mirror:
stage: security stage: security
script: script:
- npm install -g @shipzone/npmci
- npmci git mirror - npmci git mirror
tags: tags:
- docker - docker

View File

@ -68,4 +68,4 @@
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
] ]
} }

View File

@ -1,6 +1,6 @@
import * as plugins from '../npmci.plugins'; import * as plugins from '../npmci.plugins';
import {Npmci} from '../npmci.classes.npmci'; import { Npmci } from '../npmci.classes.npmci';
import { logger } from '../npmci.logging'; import { logger } from '../npmci.logging';
/** /**
@ -13,18 +13,20 @@ export class CloudlyConnector {
this.npmciRef = npmciRefArg; this.npmciRef = npmciRefArg;
} }
public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.IVersionData) { public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.IVersionData) {
const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly; const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
if (!cloudlyUrl) { if (!cloudlyUrl) {
logger.log('warn', 'no cloudly url provided. Thus we cannot announce the newly built Dockerimage!'); logger.log(
'warn',
'no cloudly url provided. Thus we cannot announce the newly built Dockerimage!'
);
return; return;
} }
const typedrequest = new plugins.typedrequest.TypedRequest< const typedrequest = new plugins.typedrequest.TypedRequest<
plugins.servezoneInterfaces.IRequest_Any_Cloudly_VersionManager_Update plugins.servezoneInterfaces.IRequest_Any_Cloudly_VersionManager_Update
>(`https://${cloudlyUrl}/versionmanager`, 'update'); >(`https://${cloudlyUrl}/versionmanager`, 'update');
const response = (await typedrequest.fire(optionsArg)); const response = await typedrequest.fire(optionsArg);
} }
} }

View File

@ -50,7 +50,7 @@ export class NpmciDockerManager {
`>>npmci docker ...<< cli arguments invalid... Please read the documentation.` `>>npmci docker ...<< cli arguments invalid... Please read the documentation.`
); );
} }
} };
/** /**
* builds a cwd of Dockerfiles by triggering a promisechain * builds a cwd of Dockerfiles by triggering a promisechain
@ -62,7 +62,7 @@ export class NpmciDockerManager {
.then(Dockerfile.sortDockerfiles) .then(Dockerfile.sortDockerfiles)
.then(Dockerfile.mapDockerfiles) .then(Dockerfile.mapDockerfiles)
.then(Dockerfile.buildDockerfiles); .then(Dockerfile.buildDockerfiles);
} };
/** /**
* login to the DockerRegistries * login to the DockerRegistries
@ -70,7 +70,7 @@ export class NpmciDockerManager {
public login = async () => { public login = async () => {
await this.prepare(); await this.prepare();
await this.npmciRegistryStorage.loginAll(); await this.npmciRegistryStorage.loginAll();
} };
/** /**
* logs in docker * logs in docker
@ -98,7 +98,7 @@ export class NpmciDockerManager {
} }
); );
return; return;
} };
/** /**
* pushes an image towards a registry * pushes an image towards a registry
@ -146,7 +146,7 @@ export class NpmciDockerManager {
await dockerfile.push(dockerRegistryToPushTo, suffix); await dockerfile.push(dockerRegistryToPushTo, suffix);
} }
} }
} };
/** /**
* pulls an image * pulls an image
@ -165,7 +165,7 @@ export class NpmciDockerManager {
for (const dockerfile of dockerfileArray) { for (const dockerfile of dockerfileArray) {
await dockerfile.pull(localDockerRegistry, suffix); await dockerfile.pull(localDockerRegistry, suffix);
} }
} };
/** /**
* tests docker files * tests docker files
@ -173,5 +173,5 @@ export class NpmciDockerManager {
public test = async () => { public test = async () => {
await this.prepare(); await this.prepare();
return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles); return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles);
} };
} }

View File

@ -6,9 +6,7 @@ export { path };
// @apiglobal // @apiglobal
import * as typedrequest from '@apiglobal/typedrequest'; import * as typedrequest from '@apiglobal/typedrequest';
export { export { typedrequest };
typedrequest
};
// @servezone // @servezone
import * as servezoneInterfaces from '@servezone/servezone-interfaces'; import * as servezoneInterfaces from '@servezone/servezone-interfaces';