Compare commits
	
		
			15 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 189d02a16f | |||
| 55aee04334 | |||
| 0e407b9b9d | |||
| 24095bbd40 | |||
| f97ee94b5a | |||
| 4cf7aea374 | |||
| 6ab5e9cb30 | |||
| 95c1145bf5 | |||
| ea04a1b788 | |||
| 3bc2499d09 | |||
| 1f5967ac45 | |||
| fd952f086b | |||
| 79500cb2c2 | |||
| 6c58864fcf | |||
| 7ea3ac182d | 
							
								
								
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@shipzone/npmci", | ||||
|   "version": "3.1.51", | ||||
|   "version": "3.1.59", | ||||
|   "lockfileVersion": 1, | ||||
|   "requires": true, | ||||
|   "dependencies": { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@shipzone/npmci", | ||||
|   "version": "3.1.51", | ||||
|   "version": "3.1.59", | ||||
|   "private": false, | ||||
|   "description": "node and docker in gitlab ci on steroids", | ||||
|   "main": "dist/index.js", | ||||
| @@ -9,8 +9,8 @@ | ||||
|     "npmci": "cli.js" | ||||
|   }, | ||||
|   "scripts": { | ||||
|     "test": "(rm -f config.json) && tstest test/", | ||||
|     "build": "(rm -f config.json) && tsbuild && (npm run testVersion)", | ||||
|     "test": "tstest test/", | ||||
|     "build": "tsbuild && (npm run testVersion)", | ||||
|     "testVersion": "(cd test/assets/ && node ../../cli.js -v)" | ||||
|   }, | ||||
|   "repository": { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import * as plugins from '../npmci.plugins'; | ||||
|  | ||||
| import {Npmci} from '../npmci.classes.npmci'; | ||||
| import { Npmci } from '../npmci.classes.npmci'; | ||||
| import { logger } from '../npmci.logging'; | ||||
|  | ||||
| /** | ||||
| @@ -13,11 +13,13 @@ export class CloudlyConnector { | ||||
|     this.npmciRef = npmciRefArg; | ||||
|   } | ||||
|  | ||||
|  | ||||
|   public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.IVersionData) { | ||||
|     const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly; | ||||
|     if (!cloudlyUrl) { | ||||
|       logger.log('warn', 'no cloudly url provided. Thus we cannot announce the newly built Dockerimage!'); | ||||
|       logger.log( | ||||
|         'warn', | ||||
|         'no cloudly url provided. Thus we cannot announce the newly built Dockerimage!' | ||||
|       ); | ||||
|       return; | ||||
|     } | ||||
|  | ||||
| @@ -25,6 +27,6 @@ export class CloudlyConnector { | ||||
|       plugins.servezoneInterfaces.IRequest_Any_Cloudly_VersionManager_Update | ||||
|     >(`https://${cloudlyUrl}/versionmanager`, 'update'); | ||||
|  | ||||
|     const response = (await typedrequest.fire(optionsArg)); | ||||
|     const response = await typedrequest.fire(optionsArg); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -50,7 +50,7 @@ export class NpmciDockerManager { | ||||
|         `>>npmci docker ...<< cli arguments invalid... Please read the documentation.` | ||||
|       ); | ||||
|     } | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * builds a cwd of Dockerfiles by triggering a promisechain | ||||
| @@ -62,7 +62,7 @@ export class NpmciDockerManager { | ||||
|       .then(Dockerfile.sortDockerfiles) | ||||
|       .then(Dockerfile.mapDockerfiles) | ||||
|       .then(Dockerfile.buildDockerfiles); | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * login to the DockerRegistries | ||||
| @@ -70,7 +70,7 @@ export class NpmciDockerManager { | ||||
|   public login = async () => { | ||||
|     await this.prepare(); | ||||
|     await this.npmciRegistryStorage.loginAll(); | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * logs in docker | ||||
| @@ -98,7 +98,7 @@ export class NpmciDockerManager { | ||||
|       } | ||||
|     ); | ||||
|     return; | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * pushes an image towards a registry | ||||
| @@ -146,7 +146,7 @@ export class NpmciDockerManager { | ||||
|         await dockerfile.push(dockerRegistryToPushTo, suffix); | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * pulls an image | ||||
| @@ -165,7 +165,7 @@ export class NpmciDockerManager { | ||||
|     for (const dockerfile of dockerfileArray) { | ||||
|       await dockerfile.pull(localDockerRegistry, suffix); | ||||
|     } | ||||
|   } | ||||
|   }; | ||||
|  | ||||
|   /** | ||||
|    * tests docker files | ||||
| @@ -173,5 +173,5 @@ export class NpmciDockerManager { | ||||
|   public test = async () => { | ||||
|     await this.prepare(); | ||||
|     return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles); | ||||
|   } | ||||
|   }; | ||||
| } | ||||
|   | ||||
| @@ -32,7 +32,7 @@ export class NpmciGitManager { | ||||
|   public mirror = async () => { | ||||
|     const githubToken = process.env.NPMCI_GIT_GITHUBTOKEN; | ||||
|     const githubUser = process.env.NPMCI_GIT_GITHUBGROUP || this.npmciRef.npmciEnv.repo.user; | ||||
|     const githubRepo = process.env.NPMCI_GIT_GITHUB || this.npmciRef.npmciEnv.repo; | ||||
|     const githubRepo = process.env.NPMCI_GIT_GITHUB || this.npmciRef.npmciEnv.repo.repo; | ||||
|     if ( | ||||
|       this.npmciRef.npmciConfig.getConfig().projectInfo.npm.packageJson.private === true || | ||||
|       this.npmciRef.npmciConfig.getConfig().npmAccessLevel === 'private' | ||||
| @@ -50,7 +50,6 @@ export class NpmciGitManager { | ||||
|       // plugins.smartgit.GitRepo; | ||||
|  | ||||
|       // add the mirror | ||||
|       console.log(`git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`); | ||||
|       await bash( | ||||
|         `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git` | ||||
|       ); | ||||
|   | ||||
| @@ -6,9 +6,7 @@ export { path }; | ||||
| // @apiglobal | ||||
| import * as typedrequest from '@apiglobal/typedrequest'; | ||||
|  | ||||
| export { | ||||
|   typedrequest | ||||
| }; | ||||
| export { typedrequest }; | ||||
|  | ||||
| // @servezone | ||||
| import * as servezoneInterfaces from '@servezone/servezone-interfaces'; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user