Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bbb5718184 | |||
| 0d8b54637c | |||
| e51b2e28b9 | |||
| f767140cc8 | |||
| 0d4d69f072 | |||
| a3e628c43f | |||
| a58fa135c1 | |||
| 93c7af6c91 | |||
| ad0e12bf7b | |||
| 498dd6eff6 | |||
| b3aa964739 | |||
| 03eb9d2657 | |||
| 373a838a6a | |||
| 960e3f4675 | |||
| 09bf676b58 | |||
| 76ba8e2ab9 | |||
| aaaaca2d19 | |||
| 71b27eda17 | |||
| 2d00882fd7 | |||
| ba5e69041f | |||
| d2871d601a | |||
| 9c66d88dc0 | |||
| fb4c84e1de | |||
| 57aca36f11 | |||
| 905f594af1 | |||
| b788b7f96b |
@@ -13,31 +13,24 @@ stages:
|
|||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- npm install -g @shipzone/npmci
|
- pnpm install -g pnpm
|
||||||
|
- pnpm install -g @shipzone/npmci
|
||||||
|
- npmci npm prepare
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
mirror:
|
# ====================
|
||||||
stage: security
|
# security stage
|
||||||
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
|
allow_failure: true
|
||||||
|
|
||||||
@@ -45,11 +38,10 @@ 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
|
||||||
|
|
||||||
@@ -60,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
|
||||||
@@ -71,10 +62,9 @@ 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 npm build
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
@@ -100,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
|
||||||
@@ -123,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
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@shipzone/npmci",
|
"name": "@shipzone/npmci",
|
||||||
"version": "4.0.2",
|
"version": "4.1.3",
|
||||||
"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",
|
||||||
@@ -12,7 +12,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "tstest test/",
|
"test": "tstest test/",
|
||||||
"build": "tsbuild --allowimplicitany && (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",
|
||||||
@@ -51,7 +52,7 @@
|
|||||||
"@pushrocks/smartrequest": "^2.0.11",
|
"@pushrocks/smartrequest": "^2.0.11",
|
||||||
"@pushrocks/smartshell": "^2.0.30",
|
"@pushrocks/smartshell": "^2.0.30",
|
||||||
"@pushrocks/smartsocket": "^2.0.7",
|
"@pushrocks/smartsocket": "^2.0.7",
|
||||||
"@pushrocks/smartssh": "^1.2.3",
|
"@pushrocks/smartssh": "^2.0.0",
|
||||||
"@pushrocks/smartstring": "^4.0.5",
|
"@pushrocks/smartstring": "^4.0.5",
|
||||||
"@servezone/interfaces": "^1.0.3",
|
"@servezone/interfaces": "^1.0.3",
|
||||||
"@tsclass/tsclass": "^4.0.21",
|
"@tsclass/tsclass": "^4.0.21",
|
||||||
|
|||||||
115
pnpm-lock.yaml
generated
115
pnpm-lock.yaml
generated
@@ -23,7 +23,7 @@ specifiers:
|
|||||||
'@pushrocks/smartrequest': ^2.0.11
|
'@pushrocks/smartrequest': ^2.0.11
|
||||||
'@pushrocks/smartshell': ^2.0.30
|
'@pushrocks/smartshell': ^2.0.30
|
||||||
'@pushrocks/smartsocket': ^2.0.7
|
'@pushrocks/smartsocket': ^2.0.7
|
||||||
'@pushrocks/smartssh': ^1.2.3
|
'@pushrocks/smartssh': ^2.0.0
|
||||||
'@pushrocks/smartstring': ^4.0.5
|
'@pushrocks/smartstring': ^4.0.5
|
||||||
'@pushrocks/tapbundle': ^5.0.4
|
'@pushrocks/tapbundle': ^5.0.4
|
||||||
'@servezone/interfaces': ^1.0.3
|
'@servezone/interfaces': ^1.0.3
|
||||||
@@ -52,7 +52,7 @@ dependencies:
|
|||||||
'@pushrocks/smartrequest': 2.0.11
|
'@pushrocks/smartrequest': 2.0.11
|
||||||
'@pushrocks/smartshell': 2.0.30
|
'@pushrocks/smartshell': 2.0.30
|
||||||
'@pushrocks/smartsocket': 2.0.7
|
'@pushrocks/smartsocket': 2.0.7
|
||||||
'@pushrocks/smartssh': 1.2.4
|
'@pushrocks/smartssh': 2.0.0
|
||||||
'@pushrocks/smartstring': 4.0.5
|
'@pushrocks/smartstring': 4.0.5
|
||||||
'@servezone/interfaces': 1.0.3
|
'@servezone/interfaces': 1.0.3
|
||||||
'@tsclass/tsclass': 4.0.21
|
'@tsclass/tsclass': 4.0.21
|
||||||
@@ -466,13 +466,6 @@ packages:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@pushrocks/smartpromise': 3.1.7
|
'@pushrocks/smartpromise': 3.1.7
|
||||||
|
|
||||||
/@pushrocks/smartenv/4.0.16:
|
|
||||||
resolution: {integrity: sha512-NwYMONDc/NjY6BGvzZzLMteF83kPQTF9BCGfqWbktUUruEtdqL+nGw6ecoLFi2b5u7XPb8jK1TKIcSvpNJ7SyA==}
|
|
||||||
dependencies:
|
|
||||||
'@pushrocks/smartpromise': 3.1.7
|
|
||||||
'@types/node': 14.18.32
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@pushrocks/smartenv/5.0.3:
|
/@pushrocks/smartenv/5.0.3:
|
||||||
resolution: {integrity: sha512-/cgEDhOIo9LB5Vd2BVO9+QrjC38w872iy7w88UWuwz7obVILWOHl3MYMHAKFqXexuwKpQ/y/Klu2xQHtOPgi6Q==}
|
resolution: {integrity: sha512-/cgEDhOIo9LB5Vd2BVO9+QrjC38w872iy7w88UWuwz7obVILWOHl3MYMHAKFqXexuwKpQ/y/Klu2xQHtOPgi6Q==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -563,22 +556,6 @@ packages:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
/@pushrocks/smartfile/7.0.12:
|
|
||||||
resolution: {integrity: sha512-/4T4K07WqOXGvQQ/VFyRMUd8kN1RdqQgmrqHjZE/vMDLz7RYsqU9FlEN6OGX1G1E6pR9IdHnT4ClXPlvzClHYg==}
|
|
||||||
dependencies:
|
|
||||||
'@pushrocks/smarthash': 2.1.10
|
|
||||||
'@pushrocks/smartmime': 1.0.5
|
|
||||||
'@pushrocks/smartpath': 4.0.3
|
|
||||||
'@pushrocks/smartpromise': 3.1.7
|
|
||||||
'@pushrocks/smartrequest': 1.1.56
|
|
||||||
'@types/fs-extra': 8.1.2
|
|
||||||
fs-extra: 8.1.0
|
|
||||||
glob: 7.2.3
|
|
||||||
js-yaml: 3.14.1
|
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@pushrocks/smartfile/8.0.11:
|
/@pushrocks/smartfile/8.0.11:
|
||||||
resolution: {integrity: sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==}
|
resolution: {integrity: sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -862,18 +839,18 @@ packages:
|
|||||||
- supports-color
|
- supports-color
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/@pushrocks/smartssh/1.2.4:
|
/@pushrocks/smartssh/2.0.0:
|
||||||
resolution: {integrity: sha512-q+AnT9nGGEzGQ0uGH58vYmUODf+NuqRv/ReyXEupSt+aowkZD7rwcETH5LDNC6lgVkk4I6K4vUEgjaI+Leigvg==}
|
resolution: {integrity: sha512-aK5AA68wOnwLwELpiry4neAF3SqI+dqjtMexBMUzkMjIngqKWBZZWmEzBZZp1BRwz4ORFasH7bbaThfgfrgYCw==}
|
||||||
dependencies:
|
dependencies:
|
||||||
'@pushrocks/smartfile': 7.0.12
|
'@pushrocks/smartfile': 10.0.5
|
||||||
'@pushrocks/smartpath': 4.0.3
|
'@pushrocks/smartpath': 5.0.5
|
||||||
'@pushrocks/smartpromise': 3.1.7
|
'@pushrocks/smartpromise': 3.1.7
|
||||||
'@pushrocks/smartshell': 2.0.30
|
'@pushrocks/smartshell': 2.0.30
|
||||||
'@pushrocks/smartstring': 3.0.26
|
'@pushrocks/smartstring': 4.0.5
|
||||||
'@types/fs-extra': 8.1.2
|
'@types/fs-extra': 9.0.13
|
||||||
'@types/minimatch': 3.0.5
|
'@types/minimatch': 5.1.2
|
||||||
fs-extra: 8.1.0
|
fs-extra: 10.1.0
|
||||||
minimatch: 3.1.2
|
minimatch: 5.1.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
dev: false
|
dev: false
|
||||||
@@ -888,18 +865,6 @@ packages:
|
|||||||
from2: 2.3.0
|
from2: 2.3.0
|
||||||
through2: 4.0.2
|
through2: 4.0.2
|
||||||
|
|
||||||
/@pushrocks/smartstring/3.0.26:
|
|
||||||
resolution: {integrity: sha512-bVAXxXpVudVvoF1ePTiHNBdAGfkH+TDe1mGV2vPg8RBYW1oGBidCDfiy7jIva+5EhdXv3E1FW7lfdwuejhP7rw==}
|
|
||||||
dependencies:
|
|
||||||
'@pushrocks/smartenv': 4.0.16
|
|
||||||
crypto-random-string: 3.3.1
|
|
||||||
js-base64: 2.6.4
|
|
||||||
normalize-newline: 3.0.0
|
|
||||||
randomatic: 3.1.1
|
|
||||||
strip-indent: 3.0.0
|
|
||||||
url: 0.11.0
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@pushrocks/smartstring/4.0.5:
|
/@pushrocks/smartstring/4.0.5:
|
||||||
resolution: {integrity: sha512-g9a/Mfj+eJAUrTDQoH3oaYegjI98WlVoSLAI8lpExQ/STlEJGO5ZdWDqgZ0HvHe+5UeWvxzCFpHifqRhMUJ+dQ==}
|
resolution: {integrity: sha512-g9a/Mfj+eJAUrTDQoH3oaYegjI98WlVoSLAI8lpExQ/STlEJGO5ZdWDqgZ0HvHe+5UeWvxzCFpHifqRhMUJ+dQ==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -1196,12 +1161,6 @@ packages:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 18.8.4
|
'@types/node': 18.8.4
|
||||||
|
|
||||||
/@types/fs-extra/8.1.2:
|
|
||||||
resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==}
|
|
||||||
dependencies:
|
|
||||||
'@types/node': 18.8.4
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@types/fs-extra/9.0.13:
|
/@types/fs-extra/9.0.13:
|
||||||
resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
|
resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -1307,10 +1266,6 @@ packages:
|
|||||||
/@types/minimatch/5.1.2:
|
/@types/minimatch/5.1.2:
|
||||||
resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
|
resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
|
||||||
|
|
||||||
/@types/node/14.18.32:
|
|
||||||
resolution: {integrity: sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@types/node/18.8.4:
|
/@types/node/18.8.4:
|
||||||
resolution: {integrity: sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==}
|
resolution: {integrity: sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==}
|
||||||
|
|
||||||
@@ -1926,13 +1881,6 @@ packages:
|
|||||||
which: 2.0.2
|
which: 2.0.2
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/crypto-random-string/3.3.1:
|
|
||||||
resolution: {integrity: sha512-5j88ECEn6h17UePrLi6pn1JcLtAiANa3KExyr9y9Z5vo2mv56Gh3I4Aja/B9P9uyMwyxNHAHWv+nE72f30T5Dg==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
dependencies:
|
|
||||||
type-fest: 0.8.1
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/crypto-random-string/4.0.0:
|
/crypto-random-string/4.0.0:
|
||||||
resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
|
resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
|
||||||
engines: {node: '>=12'}
|
engines: {node: '>=12'}
|
||||||
@@ -2568,15 +2516,6 @@ packages:
|
|||||||
jsonfile: 6.1.0
|
jsonfile: 6.1.0
|
||||||
universalify: 2.0.0
|
universalify: 2.0.0
|
||||||
|
|
||||||
/fs-extra/8.1.0:
|
|
||||||
resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
|
|
||||||
engines: {node: '>=6 <7 || >=8'}
|
|
||||||
dependencies:
|
|
||||||
graceful-fs: 4.2.10
|
|
||||||
jsonfile: 4.0.0
|
|
||||||
universalify: 0.1.2
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/fs.realpath/1.0.0:
|
/fs.realpath/1.0.0:
|
||||||
resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=}
|
resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=}
|
||||||
|
|
||||||
@@ -2992,10 +2931,6 @@ packages:
|
|||||||
istanbul-lib-report: 3.0.0
|
istanbul-lib-report: 3.0.0
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/js-base64/2.6.4:
|
|
||||||
resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/js-base64/3.7.2:
|
/js-base64/3.7.2:
|
||||||
resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
|
resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
|
||||||
|
|
||||||
@@ -3020,12 +2955,6 @@ packages:
|
|||||||
resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=}
|
resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/jsonfile/4.0.0:
|
|
||||||
resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=}
|
|
||||||
optionalDependencies:
|
|
||||||
graceful-fs: 4.2.10
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/jsonfile/6.1.0:
|
/jsonfile/6.1.0:
|
||||||
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
|
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3403,11 +3332,6 @@ packages:
|
|||||||
whatwg-url: 5.0.0
|
whatwg-url: 5.0.0
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/normalize-newline/3.0.0:
|
|
||||||
resolution: {integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM=}
|
|
||||||
engines: {node: '>=4'}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/normalize-newline/4.1.0:
|
/normalize-newline/4.1.0:
|
||||||
resolution: {integrity: sha512-ff4jKqMI8Xl50/4Mms/9jPobzAV/UK+kXG2XJ/7AqOmxIx8mqfqTIHYxuAnEgJ2AQeBbLnlbmZ5+38Y9A0w/YA==}
|
resolution: {integrity: sha512-ff4jKqMI8Xl50/4Mms/9jPobzAV/UK+kXG2XJ/7AqOmxIx8mqfqTIHYxuAnEgJ2AQeBbLnlbmZ5+38Y9A0w/YA==}
|
||||||
engines: {node: '>=12'}
|
engines: {node: '>=12'}
|
||||||
@@ -4039,13 +3963,6 @@ packages:
|
|||||||
ansi-regex: 5.0.1
|
ansi-regex: 5.0.1
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/strip-indent/3.0.0:
|
|
||||||
resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
dependencies:
|
|
||||||
min-indent: 1.0.1
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/strip-indent/4.0.0:
|
/strip-indent/4.0.0:
|
||||||
resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==}
|
resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==}
|
||||||
engines: {node: '>=12'}
|
engines: {node: '>=12'}
|
||||||
@@ -4205,11 +4122,6 @@ packages:
|
|||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/type-fest/0.8.1:
|
|
||||||
resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/type-fest/1.4.0:
|
/type-fest/1.4.0:
|
||||||
resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
|
resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -4263,11 +4175,6 @@ packages:
|
|||||||
tiny-inflate: 1.0.3
|
tiny-inflate: 1.0.3
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/universalify/0.1.2:
|
|
||||||
resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
|
|
||||||
engines: {node: '>= 4.0.0'}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/universalify/2.0.0:
|
/universalify/2.0.0:
|
||||||
resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
|
resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ Code Style | [](htt
|
|||||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
@@ -106,7 +105,6 @@ We are always happy for code contributions. If you are not the code contributing
|
|||||||
|
|
||||||
For further information read the linked docs at the top of this readme.
|
For further information read the linked docs at the top of this readme.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
## Legal
|
||||||
|
> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
|
||||||
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
||||||
|
|
||||||
[](https://maintainedby.lossless.com)
|
|
||||||
|
|||||||
@@ -1,23 +1,26 @@
|
|||||||
process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
|
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
|
||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
|
||||||
import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
|
import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
|
||||||
|
|
||||||
tap.test('should be able to announce a container to cloudly', async () => {
|
tap.test('should be able to announce a container to cloudly', async () => {
|
||||||
const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
|
const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
|
||||||
await cloudlyConnector.announceDockerContainer({
|
await cloudlyConnector.announceDockerContainer(
|
||||||
|
{
|
||||||
registryUrl: 'registry.losssless.com',
|
registryUrl: 'registry.losssless.com',
|
||||||
tag: 'testcontainer',
|
tag: 'testcontainer',
|
||||||
version: 'x.x.x',
|
version: 'x.x.x',
|
||||||
labels: []
|
labels: [],
|
||||||
}, 'cloudly.lossless.one')
|
},
|
||||||
|
'cloudly.lossless.one'
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should close the program despite socket timeout', async (toolsArg) => {
|
tap.test('should close the program despite socket timeout', async (toolsArg) => {
|
||||||
// TODO: remove when unreffed timeouts in webrequest have been solved.
|
// TODO: remove when unreffed timeouts in webrequest have been solved.
|
||||||
toolsArg.delayFor(0).then(() => {
|
toolsArg.delayFor(0).then(() => {
|
||||||
process.exit();
|
process.exit();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
@@ -3,7 +3,7 @@ import * as path from 'path';
|
|||||||
import * as smartpath from '@pushrocks/smartpath';
|
import * as smartpath from '@pushrocks/smartpath';
|
||||||
|
|
||||||
process.env.NPMTS_TEST = 'true';
|
process.env.NPMTS_TEST = 'true';
|
||||||
process.env.NPMCI_URL_CLOUDLY = 'localhost'
|
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';
|
||||||
@@ -23,7 +23,7 @@ let npmci: typeof import('../ts/index.js');
|
|||||||
|
|
||||||
tap.preTask('should import npmci', async () => {
|
tap.preTask('should import npmci', async () => {
|
||||||
npmci = await import('../ts/index.js');
|
npmci = await import('../ts/index.js');
|
||||||
})
|
});
|
||||||
|
|
||||||
// ======
|
// ======
|
||||||
// Docker
|
// Docker
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@shipzone/npmci',
|
name: '@shipzone/npmci',
|
||||||
version: '4.0.2',
|
version: '4.1.3',
|
||||||
description: 'node and docker in gitlab ci on steroids'
|
description: 'node and docker in gitlab ci on steroids'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export class CloudlyConnector {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const response = await typedrequest.fire({
|
const response = await typedrequest.fire({
|
||||||
containerImageInfo: optionsArg
|
containerImageInfo: optionsArg,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ export class NpmciDockerManager {
|
|||||||
*/
|
*/
|
||||||
public prepare = async () => {
|
public prepare = async () => {
|
||||||
// Always login to GitLab Registry
|
// Always login to GitLab Registry
|
||||||
if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
|
if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
|
||||||
logger.log('error', 'No registry token specified by gitlab!');
|
logger.log('error', 'No registry token specified by gitlab!');
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,7 @@ export class NpmciDockerManager {
|
|||||||
new DockerRegistry({
|
new DockerRegistry({
|
||||||
registryUrl: 'registry.gitlab.com',
|
registryUrl: 'registry.gitlab.com',
|
||||||
username: 'gitlab-ci-token',
|
username: 'gitlab-ci-token',
|
||||||
password: process.env.CI_BUILD_TOKEN,
|
password: process.env.CI_JOB_TOKEN,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -177,14 +177,17 @@ 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',
|
||||||
buildArgsString = `${buildArgsString} --build-arg ${key}="${targetValue}"`;
|
`docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"`
|
||||||
|
);
|
||||||
|
const targetValue = process.env[dockerArgOuterEnvVar];
|
||||||
|
buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`;
|
||||||
}
|
}
|
||||||
return buildArgsString;
|
return buildArgsString;
|
||||||
}
|
}
|
||||||
@@ -276,8 +279,7 @@ export class Dockerfile {
|
|||||||
registryUrl: this.pushTag,
|
registryUrl: this.pushTag,
|
||||||
tag: this.buildTag,
|
tag: this.buildTag,
|
||||||
labels: [],
|
labels: [],
|
||||||
version:
|
version: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
|
||||||
this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ export class NpmciNpmManager {
|
|||||||
'NPMCI_TOKEN_NPM*',
|
'NPMCI_TOKEN_NPM*',
|
||||||
(npmEnvArg: string) => {
|
(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.');
|
||||||
@@ -151,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();
|
||||||
@@ -172,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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
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';
|
||||||
@@ -79,17 +79,16 @@ 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.js');
|
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(
|
||||||
|
|||||||
@@ -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'),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,7 +3,10 @@ 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(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
|
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
|
||||||
|
|||||||
@@ -57,9 +57,7 @@ export {
|
|||||||
// @tsclass scope
|
// @tsclass scope
|
||||||
import * as tsclass from '@tsclass/tsclass';
|
import * as tsclass from '@tsclass/tsclass';
|
||||||
|
|
||||||
export {
|
export { tsclass };
|
||||||
tsclass
|
|
||||||
}
|
|
||||||
|
|
||||||
// third party
|
// third party
|
||||||
import * as through2 from 'through2';
|
import * as through2 from 'through2';
|
||||||
|
|||||||
Reference in New Issue
Block a user