fix(core): update

This commit is contained in:
2021-05-14 18:11:12 +00:00
parent efdf789575
commit f850c79b6c
27 changed files with 9928 additions and 1536 deletions

View File

@@ -21,7 +21,7 @@ export class NpmciDockerManager {
* handle cli input
* @param argvArg
*/
public handleCli = async argvArg => {
public handleCli = async (argvArg) => {
if (argvArg._.length >= 2) {
const action: string = argvArg._[1];
switch (action) {
@@ -85,7 +85,7 @@ export class NpmciDockerManager {
new DockerRegistry({
registryUrl: 'registry.gitlab.com',
username: 'gitlab-ci-token',
password: process.env.CI_BUILD_TOKEN
password: process.env.CI_BUILD_TOKEN,
})
);
@@ -93,7 +93,7 @@ export class NpmciDockerManager {
await plugins.smartparam.forEachMinimatch(
process.env,
'NPMCI_LOGIN_DOCKER*',
async envString => {
async (envString) => {
this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
}
);
@@ -104,7 +104,7 @@ export class NpmciDockerManager {
* pushes an image towards a registry
* @param argvArg
*/
public push = async argvArg => {
public push = async (argvArg) => {
await this.prepare();
let dockerRegistryUrls: string[] = [];
@@ -151,7 +151,7 @@ export class NpmciDockerManager {
/**
* pulls an image
*/
public pull = async argvArg => {
public pull = async (argvArg) => {
await this.prepare();
const registryUrlArg = argvArg._[2];
let suffix = null;

View File

@@ -31,7 +31,7 @@ export class Dockerfile {
for (const dockerfilePath of fileTree) {
const myDockerfile = new Dockerfile(npmciDockerManagerRefArg, {
filePath: dockerfilePath,
read: true
read: true,
});
readDockerfilesArray.push(myDockerfile);
}
@@ -51,7 +51,7 @@ export class Dockerfile {
const cleanTagsOriginal = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
let sorterFunctionCounter: number = 0;
const sorterFunction = () => {
sortableArrayArg.forEach(dockerfileArg => {
sortableArrayArg.forEach((dockerfileArg) => {
const cleanTags = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
if (
cleanTags.indexOf(dockerfileArg.baseImage) === -1 &&
@@ -83,7 +83,7 @@ export class Dockerfile {
* maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
*/
public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> {
sortedDockerfileArray.forEach(dockerfileArg => {
sortedDockerfileArray.forEach((dockerfileArg) => {
if (dockerfileArg.localBaseImageDependent) {
sortedDockerfileArray.forEach((dockfile2: Dockerfile) => {
if (dockfile2.cleanTag === dockerfileArg.baseImage) {
@@ -198,7 +198,7 @@ export class Dockerfile {
trackingArrayArg: Dockerfile[]
): string[] {
const cleanTagsArray: string[] = [];
dockerfileArrayArg.forEach(dockerfileArg => {
dockerfileArrayArg.forEach((dockerfileArg) => {
if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
cleanTagsArray.push(dockerfileArg.cleanTag);
}
@@ -269,14 +269,14 @@ export class Dockerfile {
);
await bash(`docker tag ${this.buildTag} ${this.pushTag}`);
await bash(`docker push ${this.pushTag}`);
const imageDigest = (await bash(
`docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`
)).split('@')[1];
const imageDigest = (
await bash(`docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`)
).split('@')[1];
console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
dockerImageUrl: this.pushTag,
dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
.npm.version
.npm.version,
});
}

View File

@@ -32,7 +32,7 @@ export class DockerRegistry {
return new DockerRegistry({
registryUrl: registryUrl,
username: username,
password: password
password: password,
});
}

View File

@@ -1,11 +1,11 @@
import { logger } from '../npmci.logging';
import * as plugins from './mod.plugins';
import { Objectmap } from '@pushrocks/lik';
import { ObjectMap } from '@pushrocks/lik';
import { DockerRegistry } from './mod.classes.dockerregistry';
export class RegistryStorage {
objectMap = new Objectmap<DockerRegistry>();
objectMap = new ObjectMap<DockerRegistry>();
constructor() {
// Nothing here
}
@@ -15,13 +15,13 @@ export class RegistryStorage {
}
getRegistryByUrl(registryUrlArg: string) {
return this.objectMap.find(registryArg => {
return this.objectMap.find((registryArg) => {
return registryArg.registryUrl === registryUrlArg;
});
}
async loginAll() {
await this.objectMap.forEach(async registryArg => {
await this.objectMap.forEach(async (registryArg) => {
await registryArg.login();
});
logger.log('success', 'logged in successfully into all available DockerRegistries!');