fix(core): update
This commit is contained in:
parent
efdf789575
commit
f850c79b6c
4
.gitignore
vendored
4
.gitignore
vendored
@ -15,8 +15,6 @@ node_modules/
|
||||
|
||||
# builds
|
||||
dist/
|
||||
dist_web/
|
||||
dist_serve/
|
||||
dist_ts_web/
|
||||
dist_*/
|
||||
|
||||
# custom
|
||||
102
.gitlab-ci.yml
102
.gitlab-ci.yml
@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
|
||||
cache:
|
||||
paths:
|
||||
- .npmci_cache/
|
||||
key: "$CI_BUILD_STAGE"
|
||||
- .npmci_cache/
|
||||
key: '$CI_BUILD_STAGE'
|
||||
|
||||
stages:
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
|
||||
# ====================
|
||||
# security stage
|
||||
@ -18,21 +18,36 @@ stages:
|
||||
mirror:
|
||||
stage: security
|
||||
script:
|
||||
- npmci git mirror
|
||||
- npmci git mirror
|
||||
only:
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
snyk:
|
||||
auditProductionDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci command npm install -g snyk
|
||||
- npmci command npm install --ignore-scripts
|
||||
- npmci command snyk test
|
||||
- npmci command npm install --production --ignore-scripts
|
||||
- npmci command npm config set registry https://registry.npmjs.org
|
||||
- npmci command npm audit --audit-level=high --only=prod --production
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- docker
|
||||
|
||||
auditDevDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci command npm install --ignore-scripts
|
||||
- npmci command npm config set registry https://registry.npmjs.org
|
||||
- npmci command npm audit --audit-level=high --only=dev
|
||||
tags:
|
||||
- docker
|
||||
allow_failure: true
|
||||
|
||||
# ====================
|
||||
# test stage
|
||||
@ -41,37 +56,36 @@ snyk:
|
||||
testStable:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- priv
|
||||
- docker
|
||||
|
||||
testBuild:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install lts
|
||||
- npmci npm install
|
||||
- npmci command npm run build
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci command npm run build
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- docker
|
||||
|
||||
release:
|
||||
stage: release
|
||||
script:
|
||||
- npmci node install lts
|
||||
- npmci npm publish
|
||||
- npmci node install stable
|
||||
- npmci npm publish
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
# ====================
|
||||
# metadata stage
|
||||
@ -79,35 +93,39 @@ release:
|
||||
codequality:
|
||||
stage: metadata
|
||||
allow_failure: true
|
||||
only:
|
||||
- tags
|
||||
script:
|
||||
- npmci command npm install -g tslint typescript
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||
tags:
|
||||
- docker
|
||||
- priv
|
||||
- lossless
|
||||
- docker
|
||||
- priv
|
||||
|
||||
trigger:
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci trigger
|
||||
- npmci trigger
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
pages:
|
||||
image: hosttoday/ht-docker-dbase:npmci
|
||||
services:
|
||||
- docker:stable-dind
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci node install lts
|
||||
- npmci command npm install -g @gitzone/tsdoc
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command tsdoc
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
only:
|
||||
@ -115,5 +133,5 @@ pages:
|
||||
artifacts:
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- public
|
||||
- public
|
||||
allow_failure: true
|
||||
|
||||
29
.vscode/launch.json
vendored
Normal file
29
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "current file",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"${relativeFile}"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"name": "test.ts",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"test/test.ts"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
}
|
||||
]
|
||||
}
|
||||
27
.vscode/settings.json
vendored
27
.vscode/settings.json
vendored
@ -1,3 +1,26 @@
|
||||
{
|
||||
"workbench.colorCustomizations": {}
|
||||
}
|
||||
"json.schemas": [
|
||||
{
|
||||
"fileMatch": ["/npmextra.json"],
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"npmci": {
|
||||
"type": "object",
|
||||
"description": "settings for npmci"
|
||||
},
|
||||
"gitzone": {
|
||||
"type": "object",
|
||||
"description": "settings for gitzone",
|
||||
"properties": {
|
||||
"projectType": {
|
||||
"type": "string",
|
||||
"enum": ["website", "element", "service", "npm", "wcc"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
3
cli.js
3
cli.js
@ -1,3 +1,4 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
require('./dist/index');
|
||||
const cliTool = require('./dist_ts/index');
|
||||
cliTool.runCli();
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
require('@gitzone/tsrun');
|
||||
require('./ts/index');
|
||||
const cliTool = require('./ts/index');
|
||||
cliTool.runCli();
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
"command": "npmci test stable"
|
||||
},
|
||||
"gitzone": {
|
||||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "shipzone",
|
||||
|
||||
11057
package-lock.json
generated
11057
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
70
package.json
70
package.json
@ -3,8 +3,8 @@
|
||||
"version": "3.1.74",
|
||||
"private": false,
|
||||
"description": "node and docker in gitlab ci on steroids",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
"bin": {
|
||||
"npmci": "cli.js"
|
||||
},
|
||||
@ -24,46 +24,50 @@
|
||||
},
|
||||
"homepage": "https://gitlab.com/gitzone/npmci#README",
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.17",
|
||||
"@gitzone/tsrun": "^1.2.6",
|
||||
"@gitzone/tstest": "^1.0.28",
|
||||
"@pushrocks/tapbundle": "^3.2.0",
|
||||
"@types/node": "^12.12.12",
|
||||
"tslint": "^5.20.1",
|
||||
"@gitzone/tsbuild": "^2.1.25",
|
||||
"@gitzone/tsrun": "^1.2.12",
|
||||
"@gitzone/tstest": "^1.0.54",
|
||||
"@pushrocks/tapbundle": "^3.2.14",
|
||||
"@types/node": "^15.0.3",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apiglobal/typedrequest": "^1.0.24",
|
||||
"@pushrocks/lik": "^3.0.11",
|
||||
"@pushrocks/npmextra": "^3.0.7",
|
||||
"@pushrocks/projectinfo": "^4.0.2",
|
||||
"@pushrocks/qenv": "^4.0.6",
|
||||
"@apiglobal/typedrequest": "^1.0.56",
|
||||
"@pushrocks/lik": "^4.0.20",
|
||||
"@pushrocks/npmextra": "^3.0.9",
|
||||
"@pushrocks/projectinfo": "^4.0.5",
|
||||
"@pushrocks/qenv": "^4.0.10",
|
||||
"@pushrocks/smartanalytics": "^2.0.15",
|
||||
"@pushrocks/smartcli": "^3.0.7",
|
||||
"@pushrocks/smartdelay": "^2.0.6",
|
||||
"@pushrocks/smartfile": "^7.0.6",
|
||||
"@pushrocks/smartlog": "^2.0.21",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.2",
|
||||
"@pushrocks/smartparam": "^1.0.4",
|
||||
"@pushrocks/smartpromise": "^3.0.6",
|
||||
"@pushrocks/smartrequest": "^1.1.43",
|
||||
"@pushrocks/smartshell": "^2.0.25",
|
||||
"@pushrocks/smartsocket": "^1.1.58",
|
||||
"@pushrocks/smartcli": "^3.0.14",
|
||||
"@pushrocks/smartdelay": "^2.0.10",
|
||||
"@pushrocks/smartfile": "^8.0.10",
|
||||
"@pushrocks/smartlog": "^2.0.39",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.8",
|
||||
"@pushrocks/smartparam": "^1.1.6",
|
||||
"@pushrocks/smartpromise": "^3.1.5",
|
||||
"@pushrocks/smartrequest": "^1.1.51",
|
||||
"@pushrocks/smartshell": "^2.0.26",
|
||||
"@pushrocks/smartsocket": "^1.2.8",
|
||||
"@pushrocks/smartssh": "^1.2.3",
|
||||
"@pushrocks/smartstring": "^3.0.17",
|
||||
"@pushrocks/smartstring": "^3.0.24",
|
||||
"@servezone/servezone-interfaces": "^2.0.51",
|
||||
"@types/through2": "^2.0.34",
|
||||
"through2": "^3.0.1"
|
||||
"@types/through2": "^2.0.36",
|
||||
"through2": "^4.0.2"
|
||||
},
|
||||
"files": [
|
||||
"ts/*",
|
||||
"ts_web/*",
|
||||
"dist/*",
|
||||
"dist_web/*",
|
||||
"dist_ts_web/*",
|
||||
"assets/*",
|
||||
"ts/**/*",
|
||||
"ts_web/**/*",
|
||||
"dist/**/*",
|
||||
"dist_*/**/*",
|
||||
"dist_ts/**/*",
|
||||
"dist_ts_web/**/*",
|
||||
"assets/**/*",
|
||||
"cli.js",
|
||||
"npmextra.json",
|
||||
"readme.md"
|
||||
],
|
||||
"browserslist": [
|
||||
"last 1 chrome versions"
|
||||
]
|
||||
}
|
||||
}
|
||||
26
readme.md
26
readme.md
@ -8,13 +8,20 @@ node and docker in gitlab ci on steroids
|
||||
* [docs (typedoc)](https://shipzone.gitlab.io/npmci/)
|
||||
|
||||
## Status for master
|
||||
[](https://gitlab.com/shipzone/npmci/commits/master)
|
||||
[](https://gitlab.com/shipzone/npmci/commits/master)
|
||||
[](https://www.npmjs.com/package/@shipzone/npmci)
|
||||
[](https://snyk.io/test/npm/@shipzone/npmci)
|
||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
[](https://prettier.io/)
|
||||
|
||||
Status Category | Status Badge
|
||||
-- | --
|
||||
GitLab Pipelines | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
TypeScript Support | [](https://lossless.cloud)
|
||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
Code Style | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||
|
||||
## Usage
|
||||
|
||||
@ -93,6 +100,11 @@ For further information read the linked docs at the top of this README.
|
||||
|
||||
Use TypeScript for best in class instellisense.
|
||||
|
||||
|
||||
## Contribution
|
||||
|
||||
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||
|
||||
For further information read the linked docs at the top of this readme.
|
||||
|
||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||
|
||||
20
test/test.ts
20
test/test.ts
@ -31,11 +31,11 @@ tap.test('should return valid Dockerfiles', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, {
|
||||
filePath: './Dockerfile',
|
||||
read: true
|
||||
read: true,
|
||||
});
|
||||
dockerfile2 = new npmci.Dockerfile(npmciInstance.dockerManager, {
|
||||
filePath: './Dockerfile_sometag1',
|
||||
read: true
|
||||
read: true,
|
||||
});
|
||||
expect(dockerfile1.version).to.equal('latest');
|
||||
return expect(dockerfile2.version).to.equal('sometag1');
|
||||
@ -62,28 +62,28 @@ tap.test('should sort an array of Dockerfiles', async () => {
|
||||
tap.test('should build all Dockerfiles', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
return npmciInstance.dockerManager.handleCli({
|
||||
_: ['docker', 'build']
|
||||
_: ['docker', 'build'],
|
||||
});
|
||||
});
|
||||
|
||||
tap.test('should test all Dockerfiles', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
return npmciInstance.dockerManager.handleCli({
|
||||
_: ['docker', 'test']
|
||||
_: ['docker', 'test'],
|
||||
});
|
||||
});
|
||||
|
||||
tap.test('should test dockerfiles', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
return npmciInstance.dockerManager.handleCli({
|
||||
_: ['docker', 'test']
|
||||
_: ['docker', 'test'],
|
||||
});
|
||||
});
|
||||
|
||||
tap.test('should login docker daemon', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
return npmciInstance.dockerManager.handleCli({
|
||||
_: ['docker', 'login']
|
||||
_: ['docker', 'login'],
|
||||
});
|
||||
});
|
||||
|
||||
@ -93,7 +93,7 @@ tap.test('should login docker daemon', async () => {
|
||||
tap.test('should prepare SSH keys', async () => {
|
||||
const npmciModSsh = await import('../ts/mod_ssh');
|
||||
return await npmciModSsh.handleCli({
|
||||
_: ['ssh', 'prepare']
|
||||
_: ['ssh', 'prepare'],
|
||||
});
|
||||
});
|
||||
|
||||
@ -103,13 +103,13 @@ tap.test('should prepare SSH keys', async () => {
|
||||
tap.test('should install a certain version of node', async () => {
|
||||
const npmciInstance = new npmci.Npmci();
|
||||
await npmciInstance.nodejsManager.handleCli({
|
||||
_: ['node', 'install', 'stable']
|
||||
_: ['node', 'install', 'stable'],
|
||||
});
|
||||
await npmciInstance.nodejsManager.handleCli({
|
||||
_: ['node', 'install', 'lts']
|
||||
_: ['node', 'install', 'lts'],
|
||||
});
|
||||
await npmciInstance.nodejsManager.handleCli({
|
||||
_: ['node', 'install', 'legacy']
|
||||
_: ['node', 'install', 'legacy'],
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@ -13,7 +13,9 @@ export class CloudlyConnector {
|
||||
this.npmciRef = npmciRefArg;
|
||||
}
|
||||
|
||||
public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.version.IVersionData) {
|
||||
public async announceDockerContainer(
|
||||
optionsArg: plugins.servezoneInterfaces.version.IVersionData
|
||||
) {
|
||||
const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
|
||||
if (!cloudlyUrl) {
|
||||
logger.log(
|
||||
@ -23,9 +25,10 @@ export class CloudlyConnector {
|
||||
return;
|
||||
}
|
||||
|
||||
const typedrequest = new plugins.typedrequest.TypedRequest<
|
||||
plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update
|
||||
>(`https://${cloudlyUrl}/versionmanager`, 'update');
|
||||
const typedrequest = new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update>(
|
||||
`https://${cloudlyUrl}/versionmanager`,
|
||||
'update'
|
||||
);
|
||||
|
||||
const response = await typedrequest.fire(optionsArg);
|
||||
}
|
||||
|
||||
@ -5,6 +5,6 @@ export const npmciInstance = new Npmci();
|
||||
|
||||
export { Dockerfile, Npmci };
|
||||
|
||||
if (process.env.CLI_CALL) {
|
||||
export const runCli = async () => {
|
||||
npmciInstance.start();
|
||||
}
|
||||
};
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ export class DockerRegistry {
|
||||
return new DockerRegistry({
|
||||
registryUrl: registryUrl,
|
||||
username: username,
|
||||
password: password
|
||||
password: password,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -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!');
|
||||
|
||||
@ -14,7 +14,7 @@ export class NpmciGitManager {
|
||||
* handle cli input
|
||||
* @param argvArg
|
||||
*/
|
||||
public handleCli = async argvArg => {
|
||||
public handleCli = async (argvArg) => {
|
||||
if (argvArg._.length >= 2) {
|
||||
const action: string = argvArg._[1];
|
||||
switch (action) {
|
||||
|
||||
@ -24,8 +24,8 @@ export class NpmciNpmManager {
|
||||
await this.install();
|
||||
break;
|
||||
case 'build':
|
||||
await this.build();
|
||||
break;
|
||||
await this.build();
|
||||
break;
|
||||
case 'prepare':
|
||||
await this.prepare();
|
||||
break;
|
||||
@ -54,7 +54,7 @@ export class NpmciNpmManager {
|
||||
public async prepare() {
|
||||
const config = this.npmciRef.npmciConfig.getConfig();
|
||||
let npmrcFileString: string = '';
|
||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
|
||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
|
||||
const npmRegistryUrl = npmEnvArg.split('|')[0];
|
||||
const npmToken = npmEnvArg.split('|')[1];
|
||||
npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(
|
||||
@ -91,7 +91,7 @@ export class NpmciNpmManager {
|
||||
let publishVerdaccioAsWell = false;
|
||||
const config = this.npmciRef.npmciConfig.getConfig();
|
||||
const availableRegistries: string[] = [];
|
||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
|
||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
|
||||
availableRegistries.push(npmEnvArg.split('|')[0]);
|
||||
});
|
||||
|
||||
@ -116,7 +116,7 @@ export class NpmciNpmManager {
|
||||
|
||||
// publishEverywhere
|
||||
if (publishVerdaccioAsWell) {
|
||||
const verdaccioRegistry = availableRegistries.find(registryString =>
|
||||
const verdaccioRegistry = availableRegistries.find((registryString) =>
|
||||
registryString.startsWith('verdaccio')
|
||||
);
|
||||
if (verdaccioRegistry) {
|
||||
|
||||
@ -2,7 +2,7 @@ import { logger } from '../npmci.logging';
|
||||
import * as plugins from './mod.plugins';
|
||||
let sshInstance: plugins.smartssh.SshInstance;
|
||||
|
||||
export let handleCli = async argvArg => {
|
||||
export let handleCli = async (argvArg) => {
|
||||
if (argvArg._.length >= 2) {
|
||||
const action: string = argvArg._[1];
|
||||
switch (action) {
|
||||
|
||||
@ -9,7 +9,7 @@ export let trigger = async () => {
|
||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
|
||||
};
|
||||
|
||||
const evaluateTrigger = async triggerEnvVarArg => {
|
||||
const evaluateTrigger = async (triggerEnvVarArg) => {
|
||||
const triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
|
||||
const regexDomain = triggerRegexResultArray[1];
|
||||
const regexProjectId = triggerRegexResultArray[2];
|
||||
@ -30,13 +30,13 @@ const evaluateTrigger = async triggerEnvVarArg => {
|
||||
{
|
||||
name: 'token',
|
||||
payload: regexProjectTriggerToken,
|
||||
type: 'string'
|
||||
type: 'string',
|
||||
},
|
||||
{
|
||||
name: 'ref',
|
||||
payload: regexRefName,
|
||||
type: 'string'
|
||||
}
|
||||
type: 'string',
|
||||
},
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@ export let nvmAvailable = smartpromise.defer<boolean>();
|
||||
*/
|
||||
const npmciSmartshell = new plugins.smartshell.Smartshell({
|
||||
executor: 'bash',
|
||||
sourceFilePaths: []
|
||||
sourceFilePaths: [],
|
||||
});
|
||||
|
||||
/**
|
||||
@ -84,7 +84,7 @@ export let bash = async (commandArg: string, retryArg: number = 2): Promise<stri
|
||||
logger.log('info', 'ShellExec would be: ' + commandArg);
|
||||
execResult = {
|
||||
exitCode: 0,
|
||||
stdout: 'testOutput'
|
||||
stdout: 'testOutput',
|
||||
};
|
||||
}
|
||||
return execResult.stdout;
|
||||
|
||||
@ -32,7 +32,7 @@ export class Npmci {
|
||||
this.analytics = new plugins.smartanalytics.Analytics({
|
||||
apiEndPoint: 'https://pubapi.lossless.one/analytics',
|
||||
projectId: 'gitzone',
|
||||
appName: 'npmci'
|
||||
appName: 'npmci',
|
||||
});
|
||||
this.cloudlyConnector = new CloudlyConnector(this);
|
||||
this.npmciEnv = new NpmciEnv(this);
|
||||
|
||||
@ -14,11 +14,11 @@ export class NpmciCli {
|
||||
|
||||
// clean
|
||||
this.smartcli.addCommand('clean').subscribe(
|
||||
async argv => {
|
||||
async (argv) => {
|
||||
const modClean = await import('./mod_clean/index');
|
||||
await modClean.clean();
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -26,11 +26,11 @@ export class NpmciCli {
|
||||
|
||||
// command
|
||||
this.smartcli.addCommand('command').subscribe(
|
||||
async argv => {
|
||||
async (argv) => {
|
||||
const modCommand = await import('./mod_command/index');
|
||||
await modCommand.command();
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -38,10 +38,10 @@ export class NpmciCli {
|
||||
|
||||
// command
|
||||
this.smartcli.addCommand('git').subscribe(
|
||||
async argvArg => {
|
||||
async (argvArg) => {
|
||||
await this.npmciRef.gitManager.handleCli(argvArg);
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -49,10 +49,10 @@ export class NpmciCli {
|
||||
|
||||
// build
|
||||
this.smartcli.addCommand('docker').subscribe(
|
||||
async argvArg => {
|
||||
async (argvArg) => {
|
||||
await this.npmciRef.dockerManager.handleCli(argvArg);
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -60,10 +60,10 @@ export class NpmciCli {
|
||||
|
||||
// node
|
||||
this.smartcli.addCommand('node').subscribe(
|
||||
async argvArg => {
|
||||
async (argvArg) => {
|
||||
await this.npmciRef.nodejsManager.handleCli(argvArg);
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -71,21 +71,21 @@ export class NpmciCli {
|
||||
|
||||
// npm
|
||||
this.smartcli.addCommand('npm').subscribe(
|
||||
async argvArg => {
|
||||
async (argvArg) => {
|
||||
await this.npmciRef.npmManager.handleCli(argvArg);
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
}
|
||||
);
|
||||
|
||||
// trigger
|
||||
this.smartcli.addCommand('ssh').subscribe(
|
||||
async argvArg => {
|
||||
async (argvArg) => {
|
||||
const modSsh = await import('./mod_ssh/index');
|
||||
await modSsh.handleCli(argvArg);
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
@ -93,11 +93,11 @@ export class NpmciCli {
|
||||
|
||||
// trigger
|
||||
this.smartcli.addCommand('trigger').subscribe(
|
||||
async argv => {
|
||||
async (argv) => {
|
||||
const modTrigger = await import('./mod_trigger/index');
|
||||
await modTrigger.trigger();
|
||||
},
|
||||
err => {
|
||||
(err) => {
|
||||
console.log(err);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
@ -47,8 +47,7 @@ export class NpmciConfig {
|
||||
this.npmciQenv = new plugins.qenv.Qenv(
|
||||
paths.NpmciProjectDir,
|
||||
paths.NpmciProjectNogitDir,
|
||||
false,
|
||||
logger
|
||||
false
|
||||
);
|
||||
|
||||
this.configObject = {
|
||||
@ -59,7 +58,7 @@ export class NpmciConfig {
|
||||
npmAccessLevel: 'private',
|
||||
npmRegistryUrl: 'registry.npmjs.org',
|
||||
dockerBuildargEnvMap: {},
|
||||
urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY')
|
||||
urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@ export const logger = new plugins.smartlog.Smartlog({
|
||||
containerName: 'Some ContainerName',
|
||||
environment: 'test',
|
||||
runtime: 'node',
|
||||
zone: 'Some Zone'
|
||||
}
|
||||
zone: 'Some Zone',
|
||||
},
|
||||
});
|
||||
|
||||
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
|
||||
|
||||
@ -47,7 +47,7 @@ export {
|
||||
smartshell,
|
||||
smartsocket,
|
||||
smartssh,
|
||||
smartstring
|
||||
smartstring,
|
||||
};
|
||||
|
||||
import * as through2 from 'through2';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user