Compare commits
41 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e51b2e28b9 | |||
| f767140cc8 | |||
| 0d4d69f072 | |||
| a3e628c43f | |||
| a58fa135c1 | |||
| 93c7af6c91 | |||
| ad0e12bf7b | |||
| 498dd6eff6 | |||
| b3aa964739 | |||
| 03eb9d2657 | |||
| 373a838a6a | |||
| 960e3f4675 | |||
| 09bf676b58 | |||
| 76ba8e2ab9 | |||
| aaaaca2d19 | |||
| 71b27eda17 | |||
| 2d00882fd7 | |||
| ba5e69041f | |||
| d2871d601a | |||
| 9c66d88dc0 | |||
| fb4c84e1de | |||
| 57aca36f11 | |||
| 905f594af1 | |||
| b788b7f96b | |||
| 319a2dc41a | |||
| e01a998f0e | |||
| e40606d97b | |||
| 449c7b2c04 | |||
| 006782b57f | |||
| d643da29b0 | |||
| 635f92d2bc | |||
| 9a2cb56094 | |||
| 5886283002 | |||
| f886194c9c | |||
| e4efec89d9 | |||
| dbc12a593f | |||
| d7666e862b | |||
| e262d29510 | |||
| 858d97cb5c | |||
| b8a2df66fe | |||
| 1c128dd694 |
@@ -12,40 +12,36 @@ stages:
|
|||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- pnpm install -g pnpm
|
||||||
|
- pnpm install -g @shipzone/npmci
|
||||||
|
- npmci npm prepare
|
||||||
|
|
||||||
|
# ====================
|
||||||
|
# security stage
|
||||||
|
# ====================
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
mirror:
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci git mirror
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
auditProductionDependencies:
|
auditProductionDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --production --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
- npmci command pnpm audit --audit-level=high --prod
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
auditDevDependencies:
|
auditDevDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command npm audit --audit-level=high --only=dev
|
- npmci command pnpm audit --audit-level=high --dev
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
|
||||||
@@ -56,7 +52,6 @@ auditDevDependencies:
|
|||||||
testStable:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
@@ -67,7 +62,6 @@ testStable:
|
|||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command npm run build
|
- npmci command npm run build
|
||||||
@@ -96,10 +90,9 @@ codequality:
|
|||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g typescript
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
@@ -119,11 +112,9 @@ trigger:
|
|||||||
pages:
|
pages:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command npm run buildDocs
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
|||||||
4
.snyk
4
.snyk
@@ -1,4 +0,0 @@
|
|||||||
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
|
|
||||||
version: v1.13.1
|
|
||||||
ignore: {}
|
|
||||||
patch: {}
|
|
||||||
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@@ -2,28 +2,10 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "current file",
|
"command": "npm test",
|
||||||
"type": "node",
|
"name": "Run npm test",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"args": [
|
"type": "node-terminal"
|
||||||
"${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"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
4
cli.child.ts
Normal file
4
cli.child.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
process.env.CLI_CALL = 'true';
|
||||||
|
import * as cliTool from './ts/index.js';
|
||||||
|
cliTool.runCli();
|
||||||
2
cli.js
2
cli.js
@@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
process.env.CLI_CALL = 'true';
|
process.env.CLI_CALL = 'true';
|
||||||
const cliTool = require('./dist_ts/index');
|
const cliTool = await import('./dist_ts/index.js');
|
||||||
cliTool.runCli();
|
cliTool.runCli();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
process.env.CLI_CALL = 'true';
|
process.env.CLI_CALL = 'true';
|
||||||
require('@gitzone/tsrun');
|
|
||||||
const cliTool = require('./ts/index');
|
import * as tsrun from '@gitzone/tsrun';
|
||||||
cliTool.runCli();
|
tsrun.runPath('./cli.child.js', import.meta.url);
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "shipzone",
|
"gitscope": "shipzone",
|
||||||
"gitrepo": "npmci",
|
"gitrepo": "npmci",
|
||||||
"shortDescription": "node and docker in gitlab ci on steroids",
|
"description": "node and docker in gitlab ci on steroids",
|
||||||
"npmPackagename": "@shipzone/npmci",
|
"npmPackagename": "@shipzone/npmci",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
|||||||
27260
package-lock.json
generated
27260
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
52
package.json
52
package.json
@@ -1,17 +1,19 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "3.1.77",
|
"version": "4.1.2",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "node and docker in gitlab ci on steroids",
|
"description": "node and docker in gitlab ci on steroids",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
|
"type": "module",
|
||||||
"bin": {
|
"bin": {
|
||||||
"npmci": "cli.js"
|
"npmci": "cli.js"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "tstest test/",
|
"test": "tstest test/",
|
||||||
"build": "tsbuild && (npm run testVersion)",
|
"build": "tsbuild --allowimplicitany && (npm run testVersion)",
|
||||||
"testVersion": "(cd test/assets/ && node ../../cli.js -v)"
|
"testVersion": "(cd test/assets/ && node ../../cli.js -v)",
|
||||||
|
"buildDocs": "tsdoc"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -24,34 +26,36 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/gitzone/npmci#README",
|
"homepage": "https://gitlab.com/gitzone/npmci#README",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.28",
|
"@gitzone/tsbuild": "^2.1.65",
|
||||||
"@gitzone/tsrun": "^1.2.18",
|
"@gitzone/tsrun": "^1.2.37",
|
||||||
"@gitzone/tstest": "^1.0.59",
|
"@gitzone/tstest": "^1.0.73",
|
||||||
"@pushrocks/tapbundle": "^3.2.14",
|
"@pushrocks/tapbundle": "^5.0.4",
|
||||||
"@types/node": "^16.11.1",
|
"@types/node": "^18.8.3"
|
||||||
"tslint": "^6.1.3",
|
|
||||||
"tslint-config-prettier": "^1.18.0"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apiglobal/typedrequest": "^1.0.58",
|
"@apiglobal/typedrequest": "^2.0.10",
|
||||||
"@pushrocks/lik": "^5.0.0",
|
"@pushrocks/lik": "^6.0.0",
|
||||||
"@pushrocks/npmextra": "^3.0.9",
|
"@pushrocks/npmextra": "^3.0.9",
|
||||||
"@pushrocks/projectinfo": "^4.0.5",
|
"@pushrocks/projectinfo": "^5.0.1",
|
||||||
"@pushrocks/qenv": "^4.0.10",
|
"@pushrocks/qenv": "^5.0.2",
|
||||||
"@pushrocks/smartanalytics": "^2.0.15",
|
"@pushrocks/smartanalytics": "^2.0.15",
|
||||||
"@pushrocks/smartcli": "^3.0.14",
|
"@pushrocks/smartcli": "^4.0.6",
|
||||||
"@pushrocks/smartdelay": "^2.0.13",
|
"@pushrocks/smartdelay": "^2.0.13",
|
||||||
"@pushrocks/smartfile": "^8.0.10",
|
"@pushrocks/smartenv": "^5.0.3",
|
||||||
"@pushrocks/smartlog": "^2.0.44",
|
"@pushrocks/smartfile": "^10.0.5",
|
||||||
|
"@pushrocks/smartgit": "^3.0.0",
|
||||||
|
"@pushrocks/smartlog": "^3.0.1",
|
||||||
"@pushrocks/smartlog-destination-local": "^8.0.8",
|
"@pushrocks/smartlog-destination-local": "^8.0.8",
|
||||||
"@pushrocks/smartparam": "^1.1.6",
|
"@pushrocks/smartparam": "^1.1.6",
|
||||||
"@pushrocks/smartpromise": "^3.1.6",
|
"@pushrocks/smartpath": "^5.0.5",
|
||||||
"@pushrocks/smartrequest": "^1.1.52",
|
"@pushrocks/smartpromise": "^3.1.7",
|
||||||
"@pushrocks/smartshell": "^2.0.28",
|
"@pushrocks/smartrequest": "^2.0.11",
|
||||||
"@pushrocks/smartsocket": "^1.2.8",
|
"@pushrocks/smartshell": "^2.0.30",
|
||||||
"@pushrocks/smartssh": "^1.2.3",
|
"@pushrocks/smartsocket": "^2.0.7",
|
||||||
"@pushrocks/smartstring": "^3.0.24",
|
"@pushrocks/smartssh": "^2.0.0",
|
||||||
"@servezone/servezone-interfaces": "^2.0.51",
|
"@pushrocks/smartstring": "^4.0.5",
|
||||||
|
"@servezone/interfaces": "^1.0.3",
|
||||||
|
"@tsclass/tsclass": "^4.0.21",
|
||||||
"@types/through2": "^2.0.36",
|
"@types/through2": "^2.0.36",
|
||||||
"through2": "^4.0.2"
|
"through2": "^4.0.2"
|
||||||
},
|
},
|
||||||
|
|||||||
4360
pnpm-lock.yaml
generated
Normal file
4360
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -100,7 +100,6 @@ For further information read the linked docs at the top of this README.
|
|||||||
|
|
||||||
Use TypeScript for best in class instellisense.
|
Use TypeScript for best in class instellisense.
|
||||||
|
|
||||||
|
|
||||||
## Contribution
|
## 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). :)
|
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). :)
|
||||||
|
|||||||
26
test/test.cloudly.ts
Normal file
26
test/test.cloudly.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
|
||||||
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
|
||||||
|
import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
|
||||||
|
|
||||||
|
tap.test('should be able to announce a container to cloudly', async () => {
|
||||||
|
const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
|
||||||
|
await cloudlyConnector.announceDockerContainer(
|
||||||
|
{
|
||||||
|
registryUrl: 'registry.losssless.com',
|
||||||
|
tag: 'testcontainer',
|
||||||
|
version: 'x.x.x',
|
||||||
|
labels: [],
|
||||||
|
},
|
||||||
|
'cloudly.lossless.one'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should close the program despite socket timeout', async (toolsArg) => {
|
||||||
|
// TODO: remove when unreffed timeouts in webrequest have been solved.
|
||||||
|
toolsArg.delayFor(0).then(() => {
|
||||||
|
process.exit();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.start();
|
||||||
18
test/test.ts
18
test/test.ts
@@ -1,7 +1,9 @@
|
|||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
import * as smartpath from '@pushrocks/smartpath';
|
||||||
|
|
||||||
process.env.NPMTS_TEST = 'true';
|
process.env.NPMTS_TEST = 'true';
|
||||||
|
process.env.NPMCI_URL_CLOUDLY = 'localhost';
|
||||||
|
|
||||||
// set up environment
|
// set up environment
|
||||||
process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
|
process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
|
||||||
@@ -14,10 +16,14 @@ process.env.NPMCI_LOGIN_DOCKER = 'docker.io|someuser|somepass';
|
|||||||
process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##';
|
process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##';
|
||||||
|
|
||||||
process.cwd = () => {
|
process.cwd = () => {
|
||||||
return path.join(__dirname, 'assets/');
|
return path.join(smartpath.get.dirnameFromImportMetaUrl(import.meta.url), 'assets/');
|
||||||
};
|
};
|
||||||
|
|
||||||
import * as npmci from '../ts';
|
let npmci: typeof import('../ts/index.js');
|
||||||
|
|
||||||
|
tap.preTask('should import npmci', async () => {
|
||||||
|
npmci = await import('../ts/index.js');
|
||||||
|
});
|
||||||
|
|
||||||
// ======
|
// ======
|
||||||
// Docker
|
// Docker
|
||||||
@@ -37,8 +43,8 @@ tap.test('should return valid Dockerfiles', async () => {
|
|||||||
filePath: './Dockerfile_sometag1',
|
filePath: './Dockerfile_sometag1',
|
||||||
read: true,
|
read: true,
|
||||||
});
|
});
|
||||||
expect(dockerfile1.version).to.equal('latest');
|
expect(dockerfile1.version).toEqual('latest');
|
||||||
return expect(dockerfile2.version).to.equal('sometag1');
|
return expect(dockerfile2.version).toEqual('sometag1');
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should read a directory of Dockerfiles', async () => {
|
tap.test('should read a directory of Dockerfiles', async () => {
|
||||||
@@ -46,7 +52,7 @@ tap.test('should read a directory of Dockerfiles', async () => {
|
|||||||
return npmci.Dockerfile.readDockerfiles(npmciInstance.dockerManager).then(
|
return npmci.Dockerfile.readDockerfiles(npmciInstance.dockerManager).then(
|
||||||
async (readDockerfilesArrayArg: npmci.Dockerfile[]) => {
|
async (readDockerfilesArrayArg: npmci.Dockerfile[]) => {
|
||||||
sortableArray = readDockerfilesArrayArg;
|
sortableArray = readDockerfilesArrayArg;
|
||||||
return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1');
|
return expect(readDockerfilesArrayArg[1].version).toEqual('sometag1');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -91,7 +97,7 @@ tap.test('should login docker daemon', async () => {
|
|||||||
// SSH
|
// SSH
|
||||||
// ===
|
// ===
|
||||||
tap.test('should prepare SSH keys', async () => {
|
tap.test('should prepare SSH keys', async () => {
|
||||||
const npmciModSsh = await import('../ts/mod_ssh');
|
const npmciModSsh = await import('../ts/mod_ssh/index.js');
|
||||||
return await npmciModSsh.handleCli({
|
return await npmciModSsh.handleCli({
|
||||||
_: ['ssh', 'prepare'],
|
_: ['ssh', 'prepare'],
|
||||||
});
|
});
|
||||||
|
|||||||
8
ts/00_commitinfo_data.ts
Normal file
8
ts/00_commitinfo_data.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* autocreated commitinfo by @pushrocks/commitinfo
|
||||||
|
*/
|
||||||
|
export const commitinfo = {
|
||||||
|
name: '@shipzone/npmci',
|
||||||
|
version: '4.1.2',
|
||||||
|
description: 'node and docker in gitlab ci on steroids'
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as plugins from '../npmci.plugins';
|
import * as plugins from '../npmci.plugins.js';
|
||||||
|
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* connects to cloudly
|
* connects to cloudly
|
||||||
@@ -14,9 +14,10 @@ export class CloudlyConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async announceDockerContainer(
|
public async announceDockerContainer(
|
||||||
optionsArg: plugins.servezoneInterfaces.version.IVersionData
|
optionsArg: plugins.tsclass.container.IContainer,
|
||||||
|
testCloudlyUrlArg?: string
|
||||||
) {
|
) {
|
||||||
const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
|
const cloudlyUrl = testCloudlyUrlArg || this.npmciRef.npmciConfig.getConfig().urlCloudly;
|
||||||
if (!cloudlyUrl) {
|
if (!cloudlyUrl) {
|
||||||
logger.log(
|
logger.log(
|
||||||
'warn',
|
'warn',
|
||||||
@@ -25,11 +26,14 @@ export class CloudlyConnector {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const typedrequest = new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update>(
|
const typedrequest =
|
||||||
`https://${cloudlyUrl}/versionmanager`,
|
new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.requests.IRequest_InformAboutNewContainerImage>(
|
||||||
'update'
|
`https://${cloudlyUrl}/typedrequest`,
|
||||||
|
'servezonestandard_InformAboutNewContainerVersion'
|
||||||
);
|
);
|
||||||
|
|
||||||
const response = await typedrequest.fire(optionsArg);
|
const response = await typedrequest.fire({
|
||||||
|
containerImageInfo: optionsArg,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Npmci } from './npmci.classes.npmci';
|
import { Npmci } from './npmci.classes.npmci.js';
|
||||||
import { Dockerfile } from './manager.docker/mod.classes.dockerfile';
|
import { Dockerfile } from './manager.docker/mod.classes.dockerfile.js';
|
||||||
|
|
||||||
export const npmciInstance = new Npmci();
|
export const npmciInstance = new Npmci();
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
import { bash } from '../npmci.bash';
|
import { bash } from '../npmci.bash.js';
|
||||||
|
|
||||||
// classes
|
// classes
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
import { Dockerfile } from './mod.classes.dockerfile';
|
import { Dockerfile } from './mod.classes.dockerfile.js';
|
||||||
import { DockerRegistry } from './mod.classes.dockerregistry';
|
import { DockerRegistry } from './mod.classes.dockerregistry.js';
|
||||||
import { RegistryStorage } from './mod.classes.registrystorage';
|
import { RegistryStorage } from './mod.classes.registrystorage.js';
|
||||||
|
|
||||||
export class NpmciDockerManager {
|
export class NpmciDockerManager {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
@@ -134,7 +134,9 @@ export class NpmciDockerManager {
|
|||||||
const dockerfileArray = await Dockerfile.readDockerfiles(this)
|
const dockerfileArray = await Dockerfile.readDockerfiles(this)
|
||||||
.then(Dockerfile.sortDockerfiles)
|
.then(Dockerfile.sortDockerfiles)
|
||||||
.then(Dockerfile.mapDockerfiles);
|
.then(Dockerfile.mapDockerfiles);
|
||||||
const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
|
const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(
|
||||||
|
dockerRegistryUrl
|
||||||
|
);
|
||||||
if (!dockerRegistryToPushTo) {
|
if (!dockerRegistryToPushTo) {
|
||||||
logger.log(
|
logger.log(
|
||||||
'error',
|
'error',
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
|
|
||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import { bash } from '../npmci.bash';
|
import { bash } from '../npmci.bash.js';
|
||||||
|
|
||||||
import { DockerRegistry } from './mod.classes.dockerregistry';
|
import { DockerRegistry } from './mod.classes.dockerregistry.js';
|
||||||
import * as helpers from './mod.helpers';
|
import * as helpers from './mod.helpers.js';
|
||||||
import { NpmciDockerManager } from '.';
|
import { NpmciDockerManager } from './index.js';
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* class Dockerfile represents a Dockerfile on disk in npmci
|
* class Dockerfile represents a Dockerfile on disk in npmci
|
||||||
@@ -152,9 +152,8 @@ export class Dockerfile {
|
|||||||
suffixArg?: string
|
suffixArg?: string
|
||||||
): string {
|
): string {
|
||||||
// determine wether the repo should be mapped accordingly to the registry
|
// determine wether the repo should be mapped accordingly to the registry
|
||||||
const mappedRepo = npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[
|
const mappedRepo =
|
||||||
registryArg
|
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[registryArg];
|
||||||
];
|
|
||||||
const repo = (() => {
|
const repo = (() => {
|
||||||
if (mappedRepo) {
|
if (mappedRepo) {
|
||||||
return mappedRepo;
|
return mappedRepo;
|
||||||
@@ -178,14 +177,14 @@ export class Dockerfile {
|
|||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
logger.log('info', 'checking for env vars to be supplied to the docker build');
|
logger.log('info', 'checking for env vars to be supplied to the docker build');
|
||||||
let buildArgsString: string = '';
|
let buildArgsString: string = '';
|
||||||
for (const key of Object.keys(
|
for (const dockerArgKey of Object.keys(
|
||||||
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap
|
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap
|
||||||
)) {
|
)) {
|
||||||
const targetValue =
|
const dockerArgOuterEnvVar =
|
||||||
process.env[
|
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[dockerArgKey];
|
||||||
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[key]
|
logger.log('note', `docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"`);
|
||||||
];
|
const targetValue = process.env[dockerArgOuterEnvVar];
|
||||||
buildArgsString = `${buildArgsString} --build-arg ${key}="${targetValue}"`;
|
buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`;
|
||||||
}
|
}
|
||||||
return buildArgsString;
|
return buildArgsString;
|
||||||
}
|
}
|
||||||
@@ -274,9 +273,10 @@ export class Dockerfile {
|
|||||||
).split('@')[1];
|
).split('@')[1];
|
||||||
console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
|
console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
|
||||||
await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
|
await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
|
||||||
dockerImageUrl: this.pushTag,
|
registryUrl: this.pushTag,
|
||||||
dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
|
tag: this.buildTag,
|
||||||
.npm.version,
|
labels: [],
|
||||||
|
version: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import { bash } from '../npmci.bash';
|
import { bash } from '../npmci.bash.js';
|
||||||
|
|
||||||
export interface IDockerRegistryConstructorOptions {
|
export interface IDockerRegistryConstructorOptions {
|
||||||
registryUrl: string;
|
registryUrl: string;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import { ObjectMap } from '@pushrocks/lik';
|
import { ObjectMap } from '@pushrocks/lik';
|
||||||
|
|
||||||
import { DockerRegistry } from './mod.classes.dockerregistry';
|
import { DockerRegistry } from './mod.classes.dockerregistry.js';
|
||||||
|
|
||||||
export class RegistryStorage {
|
export class RegistryStorage {
|
||||||
objectMap = new ObjectMap<DockerRegistry>();
|
objectMap = new ObjectMap<DockerRegistry>();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
|
|
||||||
import { Dockerfile } from './mod.classes.dockerfile';
|
import { Dockerfile } from './mod.classes.dockerfile.js';
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import { bash, bashNoError } from '../npmci.bash';
|
import { bash, bashNoError } from '../npmci.bash.js';
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciGitManager {
|
export class NpmciGitManager {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import * as plugins from '../npmci.plugins';
|
import * as plugins from '../npmci.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
|
|
||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
|
import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciNodeJsManager {
|
export class NpmciNodeJsManager {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
@@ -44,11 +44,11 @@ export class NpmciNodeJsManager {
|
|||||||
logger.log('info', `now installing node version ${versionArg}`);
|
logger.log('info', `now installing node version ${versionArg}`);
|
||||||
let version: string;
|
let version: string;
|
||||||
if (versionArg === 'stable') {
|
if (versionArg === 'stable') {
|
||||||
version = '16';
|
version = '18';
|
||||||
} else if (versionArg === 'lts') {
|
} else if (versionArg === 'lts') {
|
||||||
version = '14';
|
version = '16';
|
||||||
} else if (versionArg === 'legacy') {
|
} else if (versionArg === 'legacy') {
|
||||||
version = '12';
|
version = '14';
|
||||||
} else {
|
} else {
|
||||||
version = versionArg;
|
version = versionArg;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
|
|
||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
|
import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
|
||||||
import { Npmci } from '../npmci.classes.npmci';
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciNpmManager {
|
export class NpmciNpmManager {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
@@ -54,8 +54,12 @@ export class NpmciNpmManager {
|
|||||||
public async prepare() {
|
public async prepare() {
|
||||||
const config = this.npmciRef.npmciConfig.getConfig();
|
const config = this.npmciRef.npmciConfig.getConfig();
|
||||||
let npmrcFileString: string = '';
|
let npmrcFileString: string = '';
|
||||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg: string) => {
|
await plugins.smartparam.forEachMinimatch(
|
||||||
|
process.env,
|
||||||
|
'NPMCI_TOKEN_NPM*',
|
||||||
|
(npmEnvArg: string) => {
|
||||||
const npmRegistryUrl = npmEnvArg.split('|')[0];
|
const npmRegistryUrl = npmEnvArg.split('|')[0];
|
||||||
|
logger.log('ok', `found token for ${npmRegistryUrl}`);
|
||||||
let npmToken = npmEnvArg.split('|')[1];
|
let npmToken = npmEnvArg.split('|')[1];
|
||||||
if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
|
if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
|
||||||
logger.log('ok', 'npm token not base64 encoded.');
|
logger.log('ok', 'npm token not base64 encoded.');
|
||||||
@@ -64,7 +68,8 @@ export class NpmciNpmManager {
|
|||||||
npmToken = plugins.smartstring.base64.decode(npmToken);
|
npmToken = plugins.smartstring.base64.decode(npmToken);
|
||||||
}
|
}
|
||||||
npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
|
npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
|
||||||
});
|
}
|
||||||
|
);
|
||||||
logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
|
logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
|
||||||
npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
|
npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
|
||||||
|
|
||||||
@@ -95,9 +100,13 @@ export class NpmciNpmManager {
|
|||||||
let publishVerdaccioAsWell = false;
|
let publishVerdaccioAsWell = false;
|
||||||
const config = this.npmciRef.npmciConfig.getConfig();
|
const config = this.npmciRef.npmciConfig.getConfig();
|
||||||
const availableRegistries: string[] = [];
|
const availableRegistries: string[] = [];
|
||||||
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg: string) => {
|
await plugins.smartparam.forEachMinimatch(
|
||||||
|
process.env,
|
||||||
|
'NPMCI_TOKEN_NPM*',
|
||||||
|
(npmEnvArg: string) => {
|
||||||
availableRegistries.push(npmEnvArg.split('|')[0]);
|
availableRegistries.push(npmEnvArg.split('|')[0]);
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// -> configure package access level
|
// -> configure package access level
|
||||||
if (config.npmAccessLevel) {
|
if (config.npmAccessLevel) {
|
||||||
@@ -143,6 +152,7 @@ export class NpmciNpmManager {
|
|||||||
logger.log('info', `now preparing environment:`);
|
logger.log('info', `now preparing environment:`);
|
||||||
this.prepare();
|
this.prepare();
|
||||||
await bash(`npm -v`);
|
await bash(`npm -v`);
|
||||||
|
await bash(`pnpm -v`);
|
||||||
|
|
||||||
// -> build it
|
// -> build it
|
||||||
await this.install();
|
await this.install();
|
||||||
@@ -164,16 +174,16 @@ export class NpmciNpmManager {
|
|||||||
|
|
||||||
public async install(): Promise<void> {
|
public async install(): Promise<void> {
|
||||||
logger.log('info', 'now installing dependencies:');
|
logger.log('info', 'now installing dependencies:');
|
||||||
await bash('npm ci');
|
await bash('pnpm install');
|
||||||
}
|
}
|
||||||
|
|
||||||
public async build(): Promise<void> {
|
public async build(): Promise<void> {
|
||||||
logger.log('info', 'now building the project:');
|
logger.log('info', 'now building the project:');
|
||||||
await bash('npm run build');
|
await bash('pnpm run build');
|
||||||
}
|
}
|
||||||
|
|
||||||
public async test(): Promise<void> {
|
public async test(): Promise<void> {
|
||||||
logger.log('info', 'now starting tests:');
|
logger.log('info', 'now starting tests:');
|
||||||
await bash('npm test');
|
await bash('pnpm test');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import * as paths from '../npmci.paths';
|
import * as paths from '../npmci.paths.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cleans npmci config files
|
* cleans npmci config files
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import { bash } from '../npmci.bash';
|
import { bash } from '../npmci.bash.js';
|
||||||
|
|
||||||
export let command = async () => {
|
export let command = async () => {
|
||||||
let wrappedCommand: string = '';
|
let wrappedCommand: string = '';
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
24
ts/mod_precheck/index.ts
Normal file
24
ts/mod_precheck/index.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import * as plugins from './plugins.js';
|
||||||
|
import * as paths from '../npmci.paths.js';
|
||||||
|
import { logger } from '../npmci.logging.js';
|
||||||
|
import { Npmci } from '../npmci.classes.npmci.js';
|
||||||
|
|
||||||
|
export const handleCli = async (npmciRefArg: Npmci, argvArg: any) => {
|
||||||
|
logger.log('info', 'checking execution context');
|
||||||
|
const presentRunnerTags = process.env.CI_RUNNER_TAGS.split(',').map((stringArg) =>
|
||||||
|
stringArg.trim()
|
||||||
|
);
|
||||||
|
let allDesiredGitlabRunnerTagsPresent = true;
|
||||||
|
for (const desiredRunnerTag of npmciRefArg.npmciConfig.getConfig().gitlabRunnerTags) {
|
||||||
|
if (!presentRunnerTags.includes(desiredRunnerTag)) {
|
||||||
|
allDesiredGitlabRunnerTagsPresent = false;
|
||||||
|
logger.log(
|
||||||
|
'error',
|
||||||
|
`Desired runnerRag ${desiredRunnerTag} is missing in current execution context.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!allDesiredGitlabRunnerTagsPresent) {
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
1
ts/mod_precheck/plugins.ts
Normal file
1
ts/mod_precheck/plugins.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export * from '../npmci.plugins.js';
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
let sshInstance: plugins.smartssh.SshInstance;
|
let sshInstance: plugins.smartssh.SshInstance;
|
||||||
|
|
||||||
export let handleCli = async (argvArg: any) => {
|
export let handleCli = async (argvArg: any) => {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import * as plugins from './mod.plugins';
|
import * as plugins from './mod.plugins.js';
|
||||||
import { bash } from '../npmci.bash';
|
import { bash } from '../npmci.bash.js';
|
||||||
import { logger } from '../npmci.logging';
|
import { logger } from '../npmci.logging.js';
|
||||||
|
|
||||||
const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
|
const triggerValueRegex =
|
||||||
|
/^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
|
||||||
|
|
||||||
export let trigger = async () => {
|
export let trigger = async () => {
|
||||||
logger.log('info', 'now running triggers');
|
logger.log('info', 'now running triggers');
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export * from '../npmci.plugins';
|
export * from '../npmci.plugins.js';
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { logger } from './npmci.logging';
|
import { logger } from './npmci.logging.js';
|
||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
import * as paths from './npmci.paths';
|
import * as paths from './npmci.paths.js';
|
||||||
|
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
|
|
||||||
import { CloudlyConnector } from './connector.cloudly/cloudlyconnector';
|
import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js';
|
||||||
|
|
||||||
import { NpmciInfo } from './npmci.classes.npmciinfo';
|
import { NpmciInfo } from './npmci.classes.npmciinfo.js';
|
||||||
import { NpmciCli } from './npmci.classes.npmcicli';
|
import { NpmciCli } from './npmci.classes.npmcicli.js';
|
||||||
import { NpmciConfig } from './npmci.classes.npmciconfig';
|
import { NpmciConfig } from './npmci.classes.npmciconfig.js';
|
||||||
|
|
||||||
// mods
|
// mods
|
||||||
import { NpmciDockerManager } from './manager.docker';
|
import { NpmciDockerManager } from './manager.docker/index.js';
|
||||||
import { NpmciGitManager } from './manager.git';
|
import { NpmciGitManager } from './manager.git/index.js';
|
||||||
import { NpmciNodeJsManager } from './manager.nodejs';
|
import { NpmciNodeJsManager } from './manager.nodejs/index.js';
|
||||||
import { NpmciNpmManager } from './manager.npm';
|
import { NpmciNpmManager } from './manager.npm/index.js';
|
||||||
import { NpmciEnv } from './npmci.classes.npmcienv';
|
import { NpmciEnv } from './npmci.classes.npmcienv.js';
|
||||||
|
|
||||||
export class Npmci {
|
export class Npmci {
|
||||||
public analytics: plugins.smartanalytics.Analytics;
|
public analytics: plugins.smartanalytics.Analytics;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { logger } from './npmci.logging';
|
import { logger } from './npmci.logging.js';
|
||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
import * as paths from './npmci.paths';
|
import * as paths from './npmci.paths.js';
|
||||||
import { Npmci } from './npmci.classes.npmci';
|
import { Npmci } from './npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciCli {
|
export class NpmciCli {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
@@ -15,7 +15,7 @@ export class NpmciCli {
|
|||||||
// clean
|
// clean
|
||||||
this.smartcli.addCommand('clean').subscribe(
|
this.smartcli.addCommand('clean').subscribe(
|
||||||
async (argv) => {
|
async (argv) => {
|
||||||
const modClean = await import('./mod_clean/index');
|
const modClean = await import('./mod_clean/index.js');
|
||||||
await modClean.clean();
|
await modClean.clean();
|
||||||
},
|
},
|
||||||
(err) => {
|
(err) => {
|
||||||
@@ -27,7 +27,7 @@ export class NpmciCli {
|
|||||||
// command
|
// command
|
||||||
this.smartcli.addCommand('command').subscribe(
|
this.smartcli.addCommand('command').subscribe(
|
||||||
async (argv) => {
|
async (argv) => {
|
||||||
const modCommand = await import('./mod_command/index');
|
const modCommand = await import('./mod_command/index.js');
|
||||||
await modCommand.command();
|
await modCommand.command();
|
||||||
},
|
},
|
||||||
(err) => {
|
(err) => {
|
||||||
@@ -79,22 +79,23 @@ export class NpmciCli {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.smartcli.addCommand('precheck').subscribe(async (argvArg) => {
|
||||||
|
const modPrecheck = await import('./mod_precheck/index.js');
|
||||||
|
await modPrecheck.handleCli(this.npmciRef, argvArg);
|
||||||
|
})
|
||||||
|
|
||||||
// trigger
|
// trigger
|
||||||
this.smartcli.addCommand('ssh').subscribe(
|
this.smartcli.addCommand('ssh').subscribe(
|
||||||
async (argvArg) => {
|
async (argvArg) => {
|
||||||
const modSsh = await import('./mod_ssh/index');
|
const modSsh = await import('./mod_ssh/index.js');
|
||||||
await modSsh.handleCli(argvArg);
|
await modSsh.handleCli(argvArg);
|
||||||
},
|
|
||||||
(err) => {
|
|
||||||
console.log(err);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// trigger
|
// trigger
|
||||||
this.smartcli.addCommand('trigger').subscribe(
|
this.smartcli.addCommand('trigger').subscribe(
|
||||||
async (argv) => {
|
async (argv) => {
|
||||||
const modTrigger = await import('./mod_trigger/index');
|
const modTrigger = await import('./mod_trigger/index.js');
|
||||||
await modTrigger.trigger();
|
await modTrigger.trigger();
|
||||||
},
|
},
|
||||||
(err) => {
|
(err) => {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
import * as paths from './npmci.paths';
|
import * as paths from './npmci.paths.js';
|
||||||
|
|
||||||
import { logger } from './npmci.logging';
|
import { logger } from './npmci.logging.js';
|
||||||
import { Npmci } from './npmci.classes.npmci';
|
import { Npmci } from './npmci.classes.npmci.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* the main config interface for npmci
|
* the main config interface for npmci
|
||||||
@@ -20,6 +20,9 @@ export interface INpmciOptions {
|
|||||||
dockerRegistryRepoMap: { [key: string]: string };
|
dockerRegistryRepoMap: { [key: string]: string };
|
||||||
dockerBuildargEnvMap: { [key: string]: string };
|
dockerBuildargEnvMap: { [key: string]: string };
|
||||||
|
|
||||||
|
// gitlab
|
||||||
|
gitlabRunnerTags: string[];
|
||||||
|
|
||||||
// urls
|
// urls
|
||||||
urlCloudly: string;
|
urlCloudly: string;
|
||||||
}
|
}
|
||||||
@@ -57,6 +60,7 @@ export class NpmciConfig {
|
|||||||
dockerRegistryRepoMap: {},
|
dockerRegistryRepoMap: {},
|
||||||
npmAccessLevel: 'private',
|
npmAccessLevel: 'private',
|
||||||
npmRegistryUrl: 'registry.npmjs.org',
|
npmRegistryUrl: 'registry.npmjs.org',
|
||||||
|
gitlabRunnerTags: [],
|
||||||
dockerBuildargEnvMap: {},
|
dockerBuildargEnvMap: {},
|
||||||
urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
|
urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
import { Npmci } from './npmci.classes.npmci';
|
import { Npmci } from './npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciEnv {
|
export class NpmciEnv {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
import * as paths from './npmci.paths';
|
import * as paths from './npmci.paths.js';
|
||||||
import { logger } from './npmci.logging';
|
import { logger } from './npmci.logging.js';
|
||||||
import { Npmci } from './npmci.classes.npmci';
|
import { Npmci } from './npmci.classes.npmci.js';
|
||||||
|
|
||||||
export class NpmciInfo {
|
export class NpmciInfo {
|
||||||
public npmciRef: Npmci;
|
public npmciRef: Npmci;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
|
|
||||||
export const logger = new plugins.smartlog.Smartlog({
|
export const logger = new plugins.smartlog.Smartlog({
|
||||||
logContext: {
|
logContext: {
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
import * as plugins from './npmci.plugins';
|
import * as plugins from './npmci.plugins.js';
|
||||||
|
|
||||||
export const cwd = process.cwd();
|
export const cwd = process.cwd();
|
||||||
|
|
||||||
// package paths
|
// package paths
|
||||||
export const NpmciPackageRoot = plugins.path.join(__dirname, '../');
|
export const NpmciPackageRoot = plugins.path.join(
|
||||||
|
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
|
||||||
|
'../'
|
||||||
|
);
|
||||||
export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
|
export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
|
||||||
|
|
||||||
// project paths
|
// project paths
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import * as typedrequest from '@apiglobal/typedrequest';
|
|||||||
export { typedrequest };
|
export { typedrequest };
|
||||||
|
|
||||||
// @servezone
|
// @servezone
|
||||||
import * as servezoneInterfaces from '@servezone/servezone-interfaces';
|
import * as servezoneInterfaces from '@servezone/interfaces';
|
||||||
|
|
||||||
export { servezoneInterfaces };
|
export { servezoneInterfaces };
|
||||||
|
|
||||||
@@ -21,9 +21,11 @@ import * as smartanalytics from '@pushrocks/smartanalytics';
|
|||||||
import * as smartdelay from '@pushrocks/smartdelay';
|
import * as smartdelay from '@pushrocks/smartdelay';
|
||||||
import * as smartfile from '@pushrocks/smartfile';
|
import * as smartfile from '@pushrocks/smartfile';
|
||||||
import * as smartcli from '@pushrocks/smartcli';
|
import * as smartcli from '@pushrocks/smartcli';
|
||||||
|
import * as smartgit from '@pushrocks/smartgit';
|
||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as smartlog from '@pushrocks/smartlog';
|
||||||
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
||||||
import * as smartparam from '@pushrocks/smartparam';
|
import * as smartparam from '@pushrocks/smartparam';
|
||||||
|
import * as smartpath from '@pushrocks/smartpath';
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
import * as smartrequest from '@pushrocks/smartrequest';
|
import * as smartrequest from '@pushrocks/smartrequest';
|
||||||
import * as smartshell from '@pushrocks/smartshell';
|
import * as smartshell from '@pushrocks/smartshell';
|
||||||
@@ -38,10 +40,12 @@ export {
|
|||||||
smartanalytics,
|
smartanalytics,
|
||||||
smartdelay,
|
smartdelay,
|
||||||
smartfile,
|
smartfile,
|
||||||
|
smartgit,
|
||||||
smartcli,
|
smartcli,
|
||||||
smartlog,
|
smartlog,
|
||||||
smartlogDestinationLocal,
|
smartlogDestinationLocal,
|
||||||
smartparam,
|
smartparam,
|
||||||
|
smartpath,
|
||||||
smartpromise,
|
smartpromise,
|
||||||
smartrequest,
|
smartrequest,
|
||||||
smartshell,
|
smartshell,
|
||||||
@@ -50,6 +54,12 @@ export {
|
|||||||
smartstring,
|
smartstring,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// @tsclass scope
|
||||||
|
import * as tsclass from '@tsclass/tsclass';
|
||||||
|
|
||||||
|
export { tsclass };
|
||||||
|
|
||||||
|
// third party
|
||||||
import * as through2 from 'through2';
|
import * as through2 from 'through2';
|
||||||
|
|
||||||
export { through2 };
|
export { through2 };
|
||||||
|
|||||||
10
tsconfig.json
Normal file
10
tsconfig.json
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"useDefineForClassFields": false,
|
||||||
|
"target": "ES2022",
|
||||||
|
"module": "ES2022",
|
||||||
|
"moduleResolution": "nodenext",
|
||||||
|
"esModuleInterop": true
|
||||||
|
}
|
||||||
|
}
|
||||||
17
tslint.json
17
tslint.json
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
|
||||||
"rules": {
|
|
||||||
"semicolon": [true, "always"],
|
|
||||||
"no-console": false,
|
|
||||||
"ordered-imports": false,
|
|
||||||
"object-literal-sort-keys": false,
|
|
||||||
"member-ordering": {
|
|
||||||
"options":{
|
|
||||||
"order": [
|
|
||||||
"static-method"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultSeverity": "warning"
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user