Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 693bda6a49 | |||
| bfe3e266ee | |||
| 5f33ebd8a7 | |||
| f78c80e100 | |||
| f4d8656831 | |||
| 2290081ef0 | |||
| 189d02a16f | |||
| 55aee04334 | |||
| 0e407b9b9d | |||
| 24095bbd40 | |||
| f97ee94b5a | |||
| 4cf7aea374 |
@@ -18,7 +18,6 @@ stages:
|
||||
mirror:
|
||||
stage: security
|
||||
script:
|
||||
- npm install -g @shipzone/npmci
|
||||
- npmci git mirror
|
||||
tags:
|
||||
- docker
|
||||
|
||||
2094
package-lock.json
generated
2094
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shipzone/npmci",
|
||||
"version": "3.1.56",
|
||||
"version": "3.1.62",
|
||||
"private": false,
|
||||
"description": "node and docker in gitlab ci on steroids",
|
||||
"main": "dist/index.js",
|
||||
@@ -26,33 +26,33 @@
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.17",
|
||||
"@gitzone/tsrun": "^1.2.6",
|
||||
"@gitzone/tstest": "^1.0.24",
|
||||
"@gitzone/tstest": "^1.0.27",
|
||||
"@pushrocks/tapbundle": "^3.0.13",
|
||||
"@types/node": "^12.7.3",
|
||||
"tslint": "^5.19.0",
|
||||
"@types/node": "^12.7.9",
|
||||
"tslint": "^5.20.0",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apiglobal/typedrequest": "^1.0.17",
|
||||
"@apiglobal/typedrequest": "^1.0.24",
|
||||
"@pushrocks/lik": "^3.0.11",
|
||||
"@pushrocks/npmextra": "^3.0.5",
|
||||
"@pushrocks/npmextra": "^3.0.7",
|
||||
"@pushrocks/projectinfo": "^4.0.2",
|
||||
"@pushrocks/qenv": "^4.0.4",
|
||||
"@pushrocks/qenv": "^4.0.6",
|
||||
"@pushrocks/smartanalytics": "^2.0.15",
|
||||
"@pushrocks/smartcli": "^3.0.7",
|
||||
"@pushrocks/smartdelay": "^2.0.3",
|
||||
"@pushrocks/smartfile": "^7.0.2",
|
||||
"@pushrocks/smartfile": "^7.0.6",
|
||||
"@pushrocks/smartgit": "^1.0.13",
|
||||
"@pushrocks/smartlog": "^2.0.19",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.2",
|
||||
"@pushrocks/smartparam": "^1.0.4",
|
||||
"@pushrocks/smartpromise": "^3.0.2",
|
||||
"@pushrocks/smartrequest": "^1.1.23",
|
||||
"@pushrocks/smartpromise": "^3.0.6",
|
||||
"@pushrocks/smartrequest": "^1.1.36",
|
||||
"@pushrocks/smartshell": "^2.0.25",
|
||||
"@pushrocks/smartsocket": "^1.1.45",
|
||||
"@pushrocks/smartsocket": "^1.1.49",
|
||||
"@pushrocks/smartssh": "^1.2.3",
|
||||
"@pushrocks/smartstring": "^3.0.10",
|
||||
"@servezone/servezone-interfaces": "^2.0.29",
|
||||
"@servezone/servezone-interfaces": "^2.0.51",
|
||||
"@types/shelljs": "^0.8.5",
|
||||
"@types/through2": "^2.0.34",
|
||||
"through2": "^3.0.1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import * as plugins from '../npmci.plugins';
|
||||
|
||||
import {Npmci} from '../npmci.classes.npmci';
|
||||
import { Npmci } from '../npmci.classes.npmci';
|
||||
import { logger } from '../npmci.logging';
|
||||
|
||||
/**
|
||||
@@ -13,18 +13,20 @@ export class CloudlyConnector {
|
||||
this.npmciRef = npmciRefArg;
|
||||
}
|
||||
|
||||
|
||||
public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.IVersionData) {
|
||||
public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.version.IVersionData) {
|
||||
const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
|
||||
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;
|
||||
}
|
||||
|
||||
const typedrequest = new plugins.typedrequest.TypedRequest<
|
||||
plugins.servezoneInterfaces.IRequest_Any_Cloudly_VersionManager_Update
|
||||
plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update
|
||||
>(`https://${cloudlyUrl}/versionmanager`, 'update');
|
||||
|
||||
const response = (await typedrequest.fire(optionsArg));
|
||||
const response = await typedrequest.fire(optionsArg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ export class NpmciDockerManager {
|
||||
`>>npmci docker ...<< cli arguments invalid... Please read the documentation.`
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* builds a cwd of Dockerfiles by triggering a promisechain
|
||||
@@ -62,7 +62,7 @@ export class NpmciDockerManager {
|
||||
.then(Dockerfile.sortDockerfiles)
|
||||
.then(Dockerfile.mapDockerfiles)
|
||||
.then(Dockerfile.buildDockerfiles);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* login to the DockerRegistries
|
||||
@@ -70,7 +70,7 @@ export class NpmciDockerManager {
|
||||
public login = async () => {
|
||||
await this.prepare();
|
||||
await this.npmciRegistryStorage.loginAll();
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* logs in docker
|
||||
@@ -98,7 +98,7 @@ export class NpmciDockerManager {
|
||||
}
|
||||
);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* pushes an image towards a registry
|
||||
@@ -146,7 +146,7 @@ export class NpmciDockerManager {
|
||||
await dockerfile.push(dockerRegistryToPushTo, suffix);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* pulls an image
|
||||
@@ -165,7 +165,7 @@ export class NpmciDockerManager {
|
||||
for (const dockerfile of dockerfileArray) {
|
||||
await dockerfile.pull(localDockerRegistry, suffix);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* tests docker files
|
||||
@@ -173,5 +173,5 @@ export class NpmciDockerManager {
|
||||
public test = async () => {
|
||||
await this.prepare();
|
||||
return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -133,8 +133,8 @@ export class NpmciNpmManager {
|
||||
await bash(`npm -v`);
|
||||
|
||||
// -> build it
|
||||
await bash(`npm install`);
|
||||
await bash(`npm run build`);
|
||||
await this.install();
|
||||
await this.build();
|
||||
|
||||
logger.log('success', `Nice!!! The build for the publication was successfull!`);
|
||||
logger.log('info', `Lets clean up so we don't publish any packages that don't belong to us:`);
|
||||
@@ -152,7 +152,12 @@ export class NpmciNpmManager {
|
||||
|
||||
public async install(): Promise<void> {
|
||||
logger.log('info', 'now installing dependencies:');
|
||||
await bash('npm install');
|
||||
await bash('npm ci');
|
||||
}
|
||||
|
||||
public async build(): Promise<void> {
|
||||
logger.log('info', 'now building the project:');
|
||||
await bash('npm run build');
|
||||
}
|
||||
|
||||
public async test(): Promise<void> {
|
||||
|
||||
@@ -6,9 +6,7 @@ export { path };
|
||||
// @apiglobal
|
||||
import * as typedrequest from '@apiglobal/typedrequest';
|
||||
|
||||
export {
|
||||
typedrequest
|
||||
};
|
||||
export { typedrequest };
|
||||
|
||||
// @servezone
|
||||
import * as servezoneInterfaces from '@servezone/servezone-interfaces';
|
||||
|
||||
Reference in New Issue
Block a user