Compare commits
	
		
			71 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| bce84a0e74 | |||
| 79bed919d8 | |||
| 4b202ce00e | |||
| 16ca787314 | |||
| 3a9b6f658a | |||
| 5c5dbf303f | |||
| 4c07131e51 | |||
| ba039469ff | |||
| 49f2498ecd | |||
| 1060060366 | |||
| 0fa3a579f7 | |||
| 0e4556d59e | |||
| e2e7967fba | |||
| 45b8d67abf | |||
| 0a69aa5d62 | |||
| dfbab1a1df | |||
| e58f009a24 | |||
| 2afd9cddc5 | |||
| d79c5366ef | |||
| 8e4f7ad244 | |||
| 39de3a1601 | |||
| cb3d2964d1 | |||
| 6b5390cef8 | |||
| 2736b85de3 | |||
| 82d7778f59 | |||
| 8c99cc0491 | |||
| 955e3d0dbe | |||
| 702ae8bed8 | |||
| b6f0723b75 | |||
| 8a2fb30e59 | |||
| 95b4030120 | |||
| 5c77cfbdc2 | |||
| 5ea42320a9 | |||
| d07ebfc9c6 | |||
| 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 | |||
| 319a2dc41a | |||
| e01a998f0e | |||
| e40606d97b | |||
| 449c7b2c04 | |||
| 006782b57f | |||
| d643da29b0 | |||
| 635f92d2bc | |||
| 9a2cb56094 | |||
| 5886283002 | |||
| f886194c9c | |||
| e4efec89d9 | 
							
								
								
									
										66
									
								
								.gitea/workflows/default_nottags.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								.gitea/workflows/default_nottags.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | |||||||
|  | name: Default (not tags) | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   push: | ||||||
|  |     tags-ignore: | ||||||
|  |       - '**' | ||||||
|  |  | ||||||
|  | env: | ||||||
|  |   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci | ||||||
|  |   NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}} | ||||||
|  |   NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}} | ||||||
|  |   NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}} | ||||||
|  |   NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}} | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |  | ||||||
|  |   security: | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     continue-on-error: true | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Install pnpm and npmci | ||||||
|  |       run: | | ||||||
|  |         pnpm install -g pnpm | ||||||
|  |         pnpm install -g @shipzone/npmci | ||||||
|  |  | ||||||
|  |     - name: Run npm prepare | ||||||
|  |       run: npmci npm prepare | ||||||
|  |  | ||||||
|  |     - name: Audit production dependencies | ||||||
|  |       run: | | ||||||
|  |         npmci command npm config set registry https://registry.npmjs.org | ||||||
|  |         npmci command pnpm audit --audit-level=high --prod | ||||||
|  |       continue-on-error: true | ||||||
|  |  | ||||||
|  |     - name: Audit development dependencies | ||||||
|  |       run: | | ||||||
|  |         npmci command npm config set registry https://registry.npmjs.org | ||||||
|  |         npmci command pnpm audit --audit-level=high --dev | ||||||
|  |       continue-on-error: true | ||||||
|  |  | ||||||
|  |   test: | ||||||
|  |     if: ${{ always() }} | ||||||
|  |     needs: security | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Test stable | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm install | ||||||
|  |         npmci npm test | ||||||
|  |  | ||||||
|  |     - name: Test build | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm install | ||||||
|  |         npmci npm build | ||||||
							
								
								
									
										108
									
								
								.gitea/workflows/default_tags.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										108
									
								
								.gitea/workflows/default_tags.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,108 @@ | |||||||
|  | name: Default (tags) | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   push: | ||||||
|  |     tags: | ||||||
|  |       - '*' | ||||||
|  |  | ||||||
|  | env: | ||||||
|  |   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci | ||||||
|  |   NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}} | ||||||
|  |   NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}} | ||||||
|  |   NPMCI_LOGIN_DOCKER_GITEA: ${{secrets.NPMCI_DOCKER_REGISTRYURL_DEFAULT}}|${{ gitea.repository_owner }}|${{ secrets.GITEA_TOKEN }} | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |  | ||||||
|  |   security: | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     continue-on-error: true | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Install pnpm and npmci | ||||||
|  |       run: | | ||||||
|  |         pnpm install -g pnpm | ||||||
|  |         pnpm install -g @shipzone/npmci | ||||||
|  |  | ||||||
|  |     - name: Run npm prepare | ||||||
|  |       run: npmci npm prepare | ||||||
|  |  | ||||||
|  |     - name: Audit production dependencies | ||||||
|  |       run: | | ||||||
|  |         npmci command npm config set registry https://registry.npmjs.org | ||||||
|  |         npmci command pnpm audit --audit-level=high --prod | ||||||
|  |       continue-on-error: true | ||||||
|  |  | ||||||
|  |     - name: Audit development dependencies | ||||||
|  |       run: | | ||||||
|  |         npmci command npm config set registry https://registry.npmjs.org | ||||||
|  |         npmci command pnpm audit --audit-level=high --dev | ||||||
|  |       continue-on-error: true | ||||||
|  |  | ||||||
|  |   test: | ||||||
|  |     if: ${{ always() }} | ||||||
|  |     needs: security | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Test stable | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm install | ||||||
|  |         npmci npm test | ||||||
|  |  | ||||||
|  |     - name: Test build | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm install | ||||||
|  |         npmci npm build | ||||||
|  |  | ||||||
|  |   release: | ||||||
|  |     needs: test | ||||||
|  |     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Release | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm publish | ||||||
|  |  | ||||||
|  |   metadata: | ||||||
|  |     needs: test | ||||||
|  |     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     container: | ||||||
|  |       image: ${{ env.IMAGE }} | ||||||
|  |     continue-on-error: true | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  |     - name: Code quality | ||||||
|  |       run: | | ||||||
|  |         npmci command npm install -g typescript | ||||||
|  |         npmci npm prepare | ||||||
|  |         npmci npm install | ||||||
|  |  | ||||||
|  |     - name: Trigger | ||||||
|  |       run: npmci trigger | ||||||
|  |  | ||||||
|  |     - name: Build docs and upload artifacts | ||||||
|  |       run: | | ||||||
|  |         npmci node install stable | ||||||
|  |         npmci npm install | ||||||
|  |         pnpm install -g @gitzone/tsdoc | ||||||
|  |         npmci command tsdoc | ||||||
|  |       continue-on-error: true | ||||||
							
								
								
									
										141
									
								
								.gitlab-ci.yml
									
									
									
									
									
								
							
							
						
						
									
										141
									
								
								.gitlab-ci.yml
									
									
									
									
									
								
							| @@ -1,141 +0,0 @@ | |||||||
| # gitzone ci_default |  | ||||||
| image: registry.gitlab.com/hosttoday/ht-docker-node:npmci |  | ||||||
|  |  | ||||||
| cache: |  | ||||||
|   paths: |  | ||||||
|     - .npmci_cache/ |  | ||||||
|   key: '$CI_BUILD_STAGE' |  | ||||||
|  |  | ||||||
| stages: |  | ||||||
|   - security |  | ||||||
|   - test |  | ||||||
|   - release |  | ||||||
|   - metadata |  | ||||||
|  |  | ||||||
| before_script: |  | ||||||
|   - npm install -g @shipzone/npmci |  | ||||||
|  |  | ||||||
| # ==================== |  | ||||||
| # security stage |  | ||||||
| # ==================== |  | ||||||
| mirror: |  | ||||||
|   stage: security |  | ||||||
|   script: |  | ||||||
|     - npmci git mirror |  | ||||||
|   only: |  | ||||||
|     - tags |  | ||||||
|   tags: |  | ||||||
|     - lossless |  | ||||||
|     - docker |  | ||||||
|     - notpriv |  | ||||||
|  |  | ||||||
| auditProductionDependencies: |  | ||||||
|   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci |  | ||||||
|   stage: security |  | ||||||
|   script: |  | ||||||
|     - npmci npm prepare |  | ||||||
|     - 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 |  | ||||||
|   allow_failure: true |  | ||||||
|  |  | ||||||
| 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 |  | ||||||
| # ==================== |  | ||||||
|  |  | ||||||
| testStable: |  | ||||||
|   stage: test |  | ||||||
|   script: |  | ||||||
|     - npmci npm prepare |  | ||||||
|     - npmci node install stable |  | ||||||
|     - npmci npm install |  | ||||||
|     - npmci npm test |  | ||||||
|   coverage: /\d+.?\d+?\%\s*coverage/ |  | ||||||
|   tags: |  | ||||||
|     - docker |  | ||||||
|  |  | ||||||
| testBuild: |  | ||||||
|   stage: test |  | ||||||
|   script: |  | ||||||
|     - npmci npm prepare |  | ||||||
|     - npmci node install stable |  | ||||||
|     - npmci npm install |  | ||||||
|     - npmci command npm run build |  | ||||||
|   coverage: /\d+.?\d+?\%\s*coverage/ |  | ||||||
|   tags: |  | ||||||
|     - docker |  | ||||||
|  |  | ||||||
| release: |  | ||||||
|   stage: release |  | ||||||
|   script: |  | ||||||
|     - npmci node install stable |  | ||||||
|     - npmci npm publish |  | ||||||
|   only: |  | ||||||
|     - tags |  | ||||||
|   tags: |  | ||||||
|     - lossless |  | ||||||
|     - docker |  | ||||||
|     - notpriv |  | ||||||
|  |  | ||||||
| # ==================== |  | ||||||
| # metadata stage |  | ||||||
| # ==================== |  | ||||||
| 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: |  | ||||||
|     - lossless |  | ||||||
|     - docker |  | ||||||
|     - priv |  | ||||||
|  |  | ||||||
| trigger: |  | ||||||
|   stage: metadata |  | ||||||
|   script: |  | ||||||
|     - npmci trigger |  | ||||||
|   only: |  | ||||||
|     - tags |  | ||||||
|   tags: |  | ||||||
|     - lossless |  | ||||||
|     - docker |  | ||||||
|     - notpriv |  | ||||||
|  |  | ||||||
| pages: |  | ||||||
|   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: |  | ||||||
|     - tags |  | ||||||
|   artifacts: |  | ||||||
|     expire_in: 1 week |  | ||||||
|     paths: |  | ||||||
|       - public |  | ||||||
|   allow_failure: true |  | ||||||
							
								
								
									
										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" | ||||||
|     } |     } | ||||||
|   | |||||||
							
								
								
									
										27557
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										27557
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										58
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										58
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,17 +1,19 @@ | |||||||
| { | { | ||||||
|   "name": "@shipzone/npmci", |   "name": "@shipzone/npmci", | ||||||
|   "version": "3.1.80", |   "version": "4.1.20", | ||||||
|   "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,37 +26,37 @@ | |||||||
|   }, |   }, | ||||||
|   "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.66", | ||||||
|     "@gitzone/tsrun": "^1.2.18", |     "@gitzone/tsrun": "^1.2.42", | ||||||
|     "@gitzone/tstest": "^1.0.59", |     "@gitzone/tstest": "^1.0.74", | ||||||
|     "@pushrocks/tapbundle": "^3.2.14", |     "@pushrocks/tapbundle": "^5.0.8", | ||||||
|     "@types/node": "^16.11.6", |     "@types/node": "^20.3.1" | ||||||
|     "tslint": "^6.1.3", |  | ||||||
|     "tslint-config-prettier": "^1.18.0" |  | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@apiglobal/typedrequest": "^1.0.58", |     "@apiglobal/typedrequest": "^2.0.12", | ||||||
|     "@pushrocks/lik": "^5.0.0", |     "@pushrocks/lik": "^6.0.2", | ||||||
|     "@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": "^3.0.1", | ||||||
|     "@pushrocks/smartfile": "^8.0.10", |     "@pushrocks/smartenv": "^5.0.5", | ||||||
|     "@pushrocks/smartgit": "^2.0.1", |     "@pushrocks/smartfile": "^10.0.25", | ||||||
|     "@pushrocks/smartlog": "^2.0.44", |     "@pushrocks/smartgit": "^3.0.0", | ||||||
|     "@pushrocks/smartlog-destination-local": "^8.0.8", |     "@pushrocks/smartlog": "^3.0.2", | ||||||
|  |     "@pushrocks/smartlog-destination-local": "^9.0.0", | ||||||
|     "@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": "^4.0.2", | ||||||
|     "@pushrocks/smartshell": "^2.0.28", |     "@pushrocks/smartrequest": "^2.0.15", | ||||||
|     "@pushrocks/smartsocket": "^1.2.8", |     "@pushrocks/smartshell": "^3.0.3", | ||||||
|     "@pushrocks/smartssh": "^1.2.3", |     "@pushrocks/smartsocket": "^2.0.19", | ||||||
|     "@pushrocks/smartstring": "^3.0.24", |     "@pushrocks/smartssh": "^2.0.0", | ||||||
|  |     "@pushrocks/smartstring": "^4.0.7", | ||||||
|     "@servezone/interfaces": "^1.0.3", |     "@servezone/interfaces": "^1.0.3", | ||||||
|     "@tsclass/tsclass": "^3.0.36", |     "@tsclass/tsclass": "^4.0.42", | ||||||
|     "@types/through2": "^2.0.36", |     "@types/through2": "^2.0.38", | ||||||
|     "through2": "^4.0.2" |     "through2": "^4.0.2" | ||||||
|   }, |   }, | ||||||
|   "files": [ |   "files": [ | ||||||
|   | |||||||
							
								
								
									
										4649
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										4649
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -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) |  | ||||||
|   | |||||||
							
								
								
									
										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(); | ||||||
							
								
								
									
										20
									
								
								test/test.ts
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								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,16 @@ 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'); | ||||||
|  |  | ||||||
|  | type TNpmciTypes = typeof import('../ts/index.js'); | ||||||
|  |  | ||||||
|  | tap.preTask('should import npmci', async () => { | ||||||
|  |   npmci = await import('../ts/index.js'); | ||||||
|  | }); | ||||||
|  |  | ||||||
| // ====== | // ====== | ||||||
| // Docker | // Docker | ||||||
| @@ -37,8 +45,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 +54,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 +99,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.20', | ||||||
|  |   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.tsclass.container.IContainer |     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', | ||||||
| @@ -32,7 +33,7 @@ export class CloudlyConnector { | |||||||
|       ); |       ); | ||||||
|  |  | ||||||
|     const response = await typedrequest.fire({ |     const response = await typedrequest.fire({ | ||||||
|       containerImageInfo: optionsArg |       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(); | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										67
									
								
								ts/manager.cloudron/index.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								ts/manager.cloudron/index.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,67 @@ | |||||||
|  | import { logger } from '../npmci.logging.js'; | ||||||
|  | import * as plugins from './mod.plugins.js'; | ||||||
|  | import * as paths from '../npmci.paths.js'; | ||||||
|  | import { bash } from '../npmci.bash.js'; | ||||||
|  | import { Npmci } from '../npmci.classes.npmci.js'; | ||||||
|  |  | ||||||
|  | export class NpmciCloudronManager { | ||||||
|  |   public npmciRef: Npmci; | ||||||
|  |  | ||||||
|  |   constructor(npmciArg: Npmci) { | ||||||
|  |     this.npmciRef = npmciArg; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * handle cli input | ||||||
|  |    * @param argvArg | ||||||
|  |    */ | ||||||
|  |   public handleCli = async (argvArg: any) => { | ||||||
|  |     if (argvArg._.length >= 2) { | ||||||
|  |       const action: string = argvArg._[1]; | ||||||
|  |       switch (action) { | ||||||
|  |         case 'deploy': | ||||||
|  |           await this.deploy(); | ||||||
|  |           break; | ||||||
|  |         default: | ||||||
|  |           logger.log('error', `>>npmci cloudron ...<< action >>${action}<< not supported`); | ||||||
|  |       } | ||||||
|  |     } else { | ||||||
|  |       logger.log( | ||||||
|  |         'info', | ||||||
|  |         `>>npmci cloudron ...<< cli arguments invalid... Please read the documentation.` | ||||||
|  |       ); | ||||||
|  |     } | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * Replaces the version string in CloudronManifest file | ||||||
|  |    * @param versionArg | ||||||
|  |    */ | ||||||
|  |   public deploy = async () => { | ||||||
|  |     logger.log('info', 'now deploying to cloudron...'); | ||||||
|  |     logger.log('info', 'installing cloudron cli...'); | ||||||
|  |     await bash(`pnpm install -g cloudron`); | ||||||
|  |     logger.log('ok', 'cloudron cli installed'); | ||||||
|  |  | ||||||
|  |     // lets set the version in the CloudronManifest file | ||||||
|  |     await this.prepareCloudronManifest(this.npmciRef.npmciConfig.getConfig().projectInfo.npm.version); | ||||||
|  |     logger.log('ok', 'CloudronManifest prepared'); | ||||||
|  |  | ||||||
|  |     // lets figure out the docker image tag | ||||||
|  |     const dockerImageTag = await this.npmciRef.npmciConfig.kvStorage.readKey('latestPushedDockerTag'); | ||||||
|  |     const appName = this.npmciRef.npmciConfig.getConfig().cloudronAppName; | ||||||
|  |      | ||||||
|  |     const cloudronEnvVar = process.env.NPMCI_LOGIN_CLOUDRON; | ||||||
|  |     const cloudronServer = cloudronEnvVar.split('|')[0]; | ||||||
|  |     const cloudronToken = cloudronEnvVar.split('|')[1]; | ||||||
|  |     await bash(`cloudron update --server ${cloudronServer} --token ${cloudronToken} --image ${dockerImageTag} --app ${appName}`); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   private prepareCloudronManifest = async (versionArg: string) => { | ||||||
|  |     const manifestPath = plugins.path.join(paths.cwd, 'CloudronManifest.json'); | ||||||
|  |     let manifestFile = plugins.smartfile.fs.toStringSync(manifestPath); | ||||||
|  |     manifestFile = manifestFile.replace(/##version##/g, versionArg); | ||||||
|  |     plugins.smartfile.memory.toFsSync(manifestFile, manifestPath); | ||||||
|  |     logger.log('info', 'Version replaced in CloudronManifest file'); | ||||||
|  |   } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								ts/manager.cloudron/mod.plugins.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								ts/manager.cloudron/mod.plugins.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | export * from '../npmci.plugins.js'; | ||||||
| @@ -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; | ||||||
| @@ -77,17 +77,20 @@ 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.GITLAB_CI) { | ||||||
|       logger.log('error', 'No registry token specified by gitlab!'); |       console.log('gitlab ci detected'); | ||||||
|  |       if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') { | ||||||
|  |         logger.log('error', 'Running in Gitlab CI, but no registry token specified by gitlab!'); | ||||||
|         process.exit(1); |         process.exit(1); | ||||||
|       } |       } | ||||||
|       this.npmciRegistryStorage.addRegistry( |       this.npmciRegistryStorage.addRegistry( | ||||||
|         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, | ||||||
|         }) |         }) | ||||||
|       ); |       ); | ||||||
|  |     } | ||||||
|  |  | ||||||
|     // handle registries |     // handle registries | ||||||
|     await plugins.smartparam.forEachMinimatch( |     await plugins.smartparam.forEachMinimatch( | ||||||
| @@ -176,4 +179,12 @@ export class NpmciDockerManager { | |||||||
|     await this.prepare(); |     await this.prepare(); | ||||||
|     return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles); |     return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles); | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * can be used to get the Dockerfiles in the directory | ||||||
|  |    */ | ||||||
|  |   getDockerfiles = async () => { | ||||||
|  |     const dockerfiles = await Dockerfile.readDockerfiles(this); | ||||||
|  |     return dockerfiles; | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -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 | ||||||
| @@ -120,15 +120,19 @@ export class Dockerfile { | |||||||
|    * returns a version for a docker file |    * returns a version for a docker file | ||||||
|    * @execution SYNC |    * @execution SYNC | ||||||
|    */ |    */ | ||||||
|   public static dockerFileVersion(dockerfileNameArg: string): string { |   public static dockerFileVersion(dockerfileInstanceArg: Dockerfile, dockerfileNameArg: string): string { | ||||||
|     let versionString: string; |     let versionString: string; | ||||||
|     const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; |     const versionRegex = /Dockerfile_([^:_]*)$/; | ||||||
|     const regexResultArray = versionRegex.exec(dockerfileNameArg); |     const regexResultArray = versionRegex.exec(dockerfileNameArg); | ||||||
|     if (regexResultArray && regexResultArray.length === 2) { |     if (regexResultArray && regexResultArray.length === 2) { | ||||||
|       versionString = regexResultArray[1]; |       versionString = regexResultArray[1]; | ||||||
|     } else { |     } else { | ||||||
|       versionString = 'latest'; |       versionString = 'latest'; | ||||||
|     } |     } | ||||||
|  |     versionString = versionString.replace( | ||||||
|  |       '##version##', | ||||||
|  |       dockerfileInstanceArg.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version | ||||||
|  |     ); | ||||||
|     return versionString; |     return versionString; | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -177,14 +181,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; | ||||||
|   } |   } | ||||||
| @@ -230,7 +237,7 @@ export class Dockerfile { | |||||||
|       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user + |       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user + | ||||||
|       '/' + |       '/' + | ||||||
|       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.repo; |       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.repo; | ||||||
|     this.version = Dockerfile.dockerFileVersion(plugins.path.parse(options.filePath).base); |     this.version = Dockerfile.dockerFileVersion(this, plugins.path.parse(options.filePath).base); | ||||||
|     this.cleanTag = this.repo + ':' + this.version; |     this.cleanTag = this.repo + ':' + this.version; | ||||||
|     this.buildTag = this.cleanTag; |     this.buildTag = this.cleanTag; | ||||||
|  |  | ||||||
| @@ -276,9 +283,9 @@ 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, |  | ||||||
|     }); |     }); | ||||||
|  |     await this.npmciDockerManagerRef.npmciRef.npmciConfig.kvStorage.writeKey('latestPushedDockerTag', this.pushTag) | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|   | |||||||
| @@ -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; | ||||||
| @@ -26,7 +26,7 @@ export class DockerRegistry { | |||||||
|       process.exit(1); |       process.exit(1); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     const registryUrl = dockerRegexResultArray[0]; |     const registryUrl = dockerRegexResultArray[0].replace('https://', '').replace('http://', ''); | ||||||
|     const username = dockerRegexResultArray[1]; |     const username = dockerRegexResultArray[1]; | ||||||
|     const password = dockerRegexResultArray[2]; |     const password = dockerRegexResultArray[2]; | ||||||
|     return new DockerRegistry({ |     return new DockerRegistry({ | ||||||
|   | |||||||
| @@ -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; | ||||||
| @@ -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'); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -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,6 +1,6 @@ | |||||||
| 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 = | const triggerValueRegex = | ||||||
|   /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/; |   /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/; | ||||||
|   | |||||||
| @@ -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,21 @@ | |||||||
| import * as plugins from './npmci.plugins'; | import * as plugins from './npmci.plugins.js'; | ||||||
|  |  | ||||||
| import { CloudlyConnector } from './connector.cloudly/cloudlyconnector'; |  | ||||||
|  |  | ||||||
| import { NpmciInfo } from './npmci.classes.npmciinfo'; | // env | ||||||
| import { NpmciCli } from './npmci.classes.npmcicli'; | import { NpmciEnv } from './npmci.classes.npmcienv.js'; | ||||||
| import { NpmciConfig } from './npmci.classes.npmciconfig'; | import { NpmciInfo } from './npmci.classes.npmciinfo.js'; | ||||||
|  | import { NpmciCli } from './npmci.classes.npmcicli.js'; | ||||||
|  | import { NpmciConfig } from './npmci.classes.npmciconfig.js'; | ||||||
|  |  | ||||||
| // mods | // connectors | ||||||
| import { NpmciDockerManager } from './manager.docker'; | import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js'; | ||||||
| import { NpmciGitManager } from './manager.git'; |  | ||||||
| import { NpmciNodeJsManager } from './manager.nodejs'; | // managers | ||||||
| import { NpmciNpmManager } from './manager.npm'; | import { NpmciCloudronManager } from './manager.cloudron/index.js'; | ||||||
| import { NpmciEnv } from './npmci.classes.npmcienv'; | import { NpmciDockerManager } from './manager.docker/index.js'; | ||||||
|  | import { NpmciGitManager } from './manager.git/index.js'; | ||||||
|  | import { NpmciNodeJsManager } from './manager.nodejs/index.js'; | ||||||
|  | import { NpmciNpmManager } from './manager.npm/index.js'; | ||||||
|  |  | ||||||
| export class Npmci { | export class Npmci { | ||||||
|   public analytics: plugins.smartanalytics.Analytics; |   public analytics: plugins.smartanalytics.Analytics; | ||||||
| @@ -23,6 +27,7 @@ export class Npmci { | |||||||
|   public npmciCli: NpmciCli; |   public npmciCli: NpmciCli; | ||||||
|  |  | ||||||
|   // managers |   // managers | ||||||
|  |   public cloudronManager: NpmciCloudronManager; | ||||||
|   public dockerManager: NpmciDockerManager; |   public dockerManager: NpmciDockerManager; | ||||||
|   public gitManager: NpmciGitManager; |   public gitManager: NpmciGitManager; | ||||||
|   public nodejsManager: NpmciNodeJsManager; |   public nodejsManager: NpmciNodeJsManager; | ||||||
| @@ -41,6 +46,7 @@ export class Npmci { | |||||||
|     this.npmciConfig = new NpmciConfig(this); |     this.npmciConfig = new NpmciConfig(this); | ||||||
|  |  | ||||||
|     // managers |     // managers | ||||||
|  |     this.cloudronManager = new NpmciCloudronManager(this); | ||||||
|     this.dockerManager = new NpmciDockerManager(this); |     this.dockerManager = new NpmciDockerManager(this); | ||||||
|     this.gitManager = new NpmciGitManager(this); |     this.gitManager = new NpmciGitManager(this); | ||||||
|     this.nodejsManager = new NpmciNodeJsManager(this); |     this.nodejsManager = new NpmciNodeJsManager(this); | ||||||
|   | |||||||
| @@ -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) => { | ||||||
| @@ -24,10 +24,21 @@ export class NpmciCli { | |||||||
|       } |       } | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|  |     // cloudron | ||||||
|  |     this.smartcli.addCommand('cloudron').subscribe( | ||||||
|  |       async (argv) => { | ||||||
|  |         await this.npmciRef.cloudronManager.handleCli(argv); | ||||||
|  |       }, | ||||||
|  |       (err) => { | ||||||
|  |         console.log(err); | ||||||
|  |         process.exit(1); | ||||||
|  |       } | ||||||
|  |     ); | ||||||
|  |  | ||||||
|     // 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) => { | ||||||
| @@ -36,7 +47,7 @@ export class NpmciCli { | |||||||
|       } |       } | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|     // command |     // git | ||||||
|     this.smartcli.addCommand('git').subscribe( |     this.smartcli.addCommand('git').subscribe( | ||||||
|       async (argvArg) => { |       async (argvArg) => { | ||||||
|         await this.npmciRef.gitManager.handleCli(argvArg); |         await this.npmciRef.gitManager.handleCli(argvArg); | ||||||
| @@ -79,22 +90,21 @@ 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'); |  | ||||||
|       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,8 +20,14 @@ 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; | ||||||
|  |  | ||||||
|  |   // cloudron | ||||||
|  |   cloudronAppName?: string; | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -57,6 +63,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; | ||||||
| @@ -9,7 +9,12 @@ export class NpmciEnv { | |||||||
|  |  | ||||||
|   constructor(npmciRefArg: Npmci) { |   constructor(npmciRefArg: Npmci) { | ||||||
|     this.npmciRef = npmciRefArg; |     this.npmciRef = npmciRefArg; | ||||||
|  |     if (process.env.GITLAB_CI) { | ||||||
|       this.repoString = process.env.CI_REPOSITORY_URL; |       this.repoString = process.env.CI_REPOSITORY_URL; | ||||||
|  |     } | ||||||
|  |     if (process.env.NPMCI_COMPUTED_REPOURL) { | ||||||
|  |       this.repoString = process.env.NPMCI_COMPUTED_REPOURL; | ||||||
|  |     } | ||||||
|     if (!this.repoString) { |     if (!this.repoString) { | ||||||
|       this.repoString = 'https://undefined:undefined@github.com/undefined/undefined.git'; |       this.repoString = 'https://undefined:undefined@github.com/undefined/undefined.git'; | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -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 | ||||||
|   | |||||||
| @@ -25,6 +25,7 @@ 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'; | ||||||
| @@ -39,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, | ||||||
| @@ -54,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'; | ||||||
|   | |||||||
							
								
								
									
										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