Compare commits
	
		
			36 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 10233ffae0 | |||
| 4cea1d29d2 | |||
| 3bf2502f87 | |||
| c012810a8c | |||
| ae5b1b1fa7 | |||
| f1bf000744 | |||
| 30e16cb33d | |||
| 16984d811f | |||
| 12e2509f0c | |||
| e0b8c4f263 | |||
| 16925a3f3f | |||
| 1ff0337112 | |||
| 6b15728fbf | |||
| 44c20deec7 | |||
| 6d328e263d | |||
| 52f09583f5 | |||
| 782738aae9 | |||
| b62104c2a5 | |||
| 3506d8dd21 | |||
| 4328672958 | |||
| 1ca90eb64d | |||
| e68ee9e593 | |||
| a597c1268b | |||
| 0e7c942a97 | |||
| c9b08b9f9d | |||
| c059dff5e0 | |||
| c0643edc82 | |||
| a8571827b9 | |||
| 1c0331524d | |||
| 66bb3a10b7 | |||
| fdfb600bea | |||
| 8847d9031b | |||
| 90295a79d9 | |||
| 270ff4bb40 | |||
| 2d34e3e9eb | |||
| c899bfa23a | 
| @@ -13,7 +13,7 @@ stages: | ||||
| - pages | ||||
|  | ||||
| before_script: | ||||
|   - yarn global add npmci | ||||
|   - yarn global add npmci@2.4.1 | ||||
|  | ||||
| testLEGACY: | ||||
|   stage: test | ||||
| @@ -43,7 +43,7 @@ testSTABLE: | ||||
| release: | ||||
|   stage: release | ||||
|   script: | ||||
|     - npmci publish | ||||
|     - npmci publish npm | ||||
|   only: | ||||
|     - tags | ||||
|   tags: | ||||
|   | ||||
							
								
								
									
										2
									
								
								dist/mod_build/index.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/mod_build/index.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -5,4 +5,4 @@ export declare type TBuildService = 'docker'; | ||||
| /** | ||||
|  * builds for a specific service | ||||
|  */ | ||||
| export declare let build: (commandArg: any) => Promise<void>; | ||||
| export declare let build: (argvArg: any) => Promise<void>; | ||||
|   | ||||
							
								
								
									
										12
									
								
								dist/mod_build/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								dist/mod_build/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -13,16 +13,16 @@ const npmciMods = require("../npmci.mods"); | ||||
| /** | ||||
|  * builds for a specific service | ||||
|  */ | ||||
| exports.build = (commandArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     switch (commandArg) { | ||||
| exports.build = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let whatToPublish = argvArg._[1]; | ||||
|     switch (whatToPublish) { | ||||
|         case 'docker': | ||||
|             let modDocker = yield npmciMods.modDocker.load(); | ||||
|             yield modDocker.build(); | ||||
|             yield modDocker.build(argvArg); | ||||
|             break; | ||||
|         default: | ||||
|             plugins.beautylog.log('build target ' + commandArg + ' not recognised!'); | ||||
|             plugins.beautylog.log('build target ' + whatToPublish + ' not recognised!'); | ||||
|     } | ||||
|     ; | ||||
|     return; | ||||
| }); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfYnVpbGQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHlDQUF3QztBQUd4QywyQ0FBMEM7QUFPMUM7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxDQUFPLFVBQVU7SUFDbEMsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLFFBQVE7WUFDWCxJQUFJLFNBQVMsR0FBRyxNQUFNLFNBQVMsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7WUFDaEQsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDdkIsS0FBSyxDQUFBO1FBQ1A7WUFDRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsVUFBVSxHQUFHLGtCQUFrQixDQUFDLENBQUE7SUFDNUUsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQSJ9 | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfYnVpbGQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHlDQUF3QztBQUd4QywyQ0FBMEM7QUFPMUM7O0dBRUc7QUFDUSxRQUFBLEtBQUssR0FBRyxDQUFPLE9BQU87SUFDL0IsSUFBSSxhQUFhLEdBQVcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QyxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLEtBQUssUUFBUTtZQUNYLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUNoRCxNQUFNLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7WUFDOUIsS0FBSyxDQUFBO1FBQ1A7WUFDRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEdBQUcsYUFBYSxHQUFHLGtCQUFrQixDQUFDLENBQUE7SUFDL0UsQ0FBQztJQUNELE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBIn0= | ||||
							
								
								
									
										8
									
								
								dist/mod_docker/mod.builddocker.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/mod_docker/mod.builddocker.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -2,12 +2,12 @@ | ||||
| /** | ||||
|  * builds a cwd of Dockerfiles by triggering a promisechain | ||||
|  */ | ||||
| export declare let build: () => Promise<void>; | ||||
| export declare let build: (argvArg: any) => Promise<void>; | ||||
| /** | ||||
|  * creates instance of class Dockerfile for all Dockerfiles in cwd | ||||
|  * @returns Promise<Dockerfile[]> | ||||
|  */ | ||||
| export declare let readDockerfiles: () => Promise<Dockerfile[]>; | ||||
| export declare let readDockerfiles: (argvArg: any) => Promise<Dockerfile[]>; | ||||
| /** | ||||
|  * sorts Dockerfiles into a dependency chain | ||||
|  * @param sortableArrayArg an array of instances of class Dockerfile | ||||
| @@ -85,11 +85,11 @@ export declare class Dockerfile { | ||||
|  */ | ||||
| export declare let dockerFileVersion: (dockerfileNameArg: string) => string; | ||||
| /** | ||||
|  * | ||||
|  * returns the docker base image for a Dockerfile | ||||
|  */ | ||||
| export declare let dockerBaseImage: (dockerfileContentArg: string) => string; | ||||
| /** | ||||
|  * | ||||
|  * returns the docker tag | ||||
|  */ | ||||
| export declare let dockerTag: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string; | ||||
| /** | ||||
|   | ||||
							
								
								
									
										34
									
								
								dist/mod_docker/mod.builddocker.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										34
									
								
								dist/mod_docker/mod.builddocker.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										28
									
								
								dist/mod_prepare/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								dist/mod_prepare/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -33,17 +33,28 @@ let npm = () => __awaiter(this, void 0, void 0, function* () { | ||||
|  * logs in docker | ||||
|  */ | ||||
| let docker = () => __awaiter(this, void 0, void 0, function* () { | ||||
|     env.setDockerRegistry('docker.io'); | ||||
|     let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/; | ||||
|     if (!process.env.NPMCI_LOGIN_DOCKER) { | ||||
|         plugins.beautylog.error('You have to specify Login Data to the Docker Registry'); | ||||
|     env.setDockerRegistry('docker.io'); // TODO: checkup why we set this here | ||||
|     // handle registries | ||||
|     plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', (envString) => __awaiter(this, void 0, void 0, function* () { | ||||
|         let dockerRegexResultArray = process.env.NPMCI_LOGIN_DOCKER.split('|'); | ||||
|         if (dockerRegexResultArray.length !== 3) { | ||||
|             plugins.beautylog.error('malformed docker env var...'); | ||||
|             process.exit(1); | ||||
|             return; | ||||
|         } | ||||
|     plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com'); // Always also login to GitLab Registry | ||||
|     let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER); | ||||
|         let registry = dockerRegexResultArray[0]; | ||||
|         let username = dockerRegexResultArray[1]; | ||||
|         let password = dockerRegexResultArray[2]; | ||||
|         if (registry === 'docker.io') { | ||||
|             yield npmci_bash_1.bash('docker login -u ' + username + ' -p ' + password); | ||||
|         } | ||||
|         else { | ||||
|             yield npmci_bash_1.bash(`docker login -u ${username} -p ${password} ${registry}`); | ||||
|         } | ||||
|         plugins.beautylog.success(`docker authenticated for ${registry}!`); | ||||
|     })); | ||||
|     // Always login to GitLab Registry | ||||
|     yield dockerGitlab(); | ||||
|     return; | ||||
| }); | ||||
| /** | ||||
| @@ -51,7 +62,8 @@ let docker = () => __awaiter(this, void 0, void 0, function* () { | ||||
|  */ | ||||
| let dockerGitlab = () => __awaiter(this, void 0, void 0, function* () { | ||||
|     env.setDockerRegistry('registry.gitlab.com'); | ||||
|     plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com'); | ||||
|     yield npmci_bash_1.bash(`docker login -u gitlab-ci-token -p ${process.env.CI_BUILD_TOKEN} registry.gitlab.com`); | ||||
|     plugins.beautylog.success(`docker authenticated for registry.gitlab.com!`); | ||||
|     return; | ||||
| }); | ||||
| /** | ||||
| @@ -79,4 +91,4 @@ exports.prepare = (serviceArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|             break; | ||||
|     } | ||||
| }); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHJlcGFyZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUNwQyxvQ0FBbUM7QUFDbkMsMkNBQTBDO0FBUzFDOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDUixJQUFJLFdBQVcsR0FBVyxtQ0FBbUMsQ0FBQTtJQUM3RCxJQUFJLFFBQVEsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQTtJQUNsRCxJQUFJLGVBQWUsR0FBVyxXQUFXLEdBQUcsUUFBUSxDQUFBO0lBQ3BELEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO0lBQzlDLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7UUFDMUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO0lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNsRSxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxNQUFNLEdBQUc7SUFDWCxHQUFHLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDbEMsSUFBSSxXQUFXLEdBQUcscUNBQXFDLENBQUE7SUFDdkQsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztRQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyx1REFBdUQsQ0FBQyxDQUFBO1FBQ2hGLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztJQUNELE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFBLENBQUMsdUNBQXVDO0lBQzlKLElBQUksc0JBQXNCLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUE7SUFDN0UsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEMsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEMsTUFBTSxpQkFBSSxDQUFDLGtCQUFrQixHQUFHLFFBQVEsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUE7SUFDN0QsTUFBTSxDQUFBO0FBQ1IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksWUFBWSxHQUFHO0lBQ2pCLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0lBQzVDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxDQUFBO0lBQ3RILE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLEdBQUcsR0FBRztJQUNSLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM3QyxNQUFNLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUN2QixDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQTtRQUNwQixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxNQUFNLEVBQUUsQ0FBQTtRQUN2QixLQUFLLGVBQWU7WUFDbEIsTUFBTSxDQUFDLE1BQU0sWUFBWSxFQUFFLENBQUE7UUFDN0IsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDcEI7WUFDRSxLQUFLLENBQUE7SUFDVCxDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUEifQ== | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHJlcGFyZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUNwQyxvQ0FBbUM7QUFDbkMsMkNBQTBDO0FBUzFDOztHQUVHO0FBQ0gsSUFBSSxHQUFHLEdBQUc7SUFDUixJQUFJLFdBQVcsR0FBVyxtQ0FBbUMsQ0FBQTtJQUM3RCxJQUFJLFFBQVEsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQTtJQUNsRCxJQUFJLGVBQWUsR0FBVyxXQUFXLEdBQUcsUUFBUSxDQUFBO0lBQ3BELEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO0lBQzlDLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7UUFDMUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO0lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNsRSxNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxNQUFNLEdBQUc7SUFDWCxHQUFHLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUEsQ0FBQyxxQ0FBcUM7SUFFeEUsb0JBQW9CO0lBQ3BCLE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxxQkFBcUIsRUFBRSxDQUFPLFNBQVM7UUFDdEYsSUFBSSxzQkFBc0IsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN0RSxFQUFFLENBQUMsQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN4QyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO1lBQ3RELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDZixNQUFNLENBQUE7UUFDUixDQUFDO1FBQ0QsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDeEMsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDeEMsSUFBSSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDeEMsRUFBRSxDQUFDLENBQUMsUUFBUSxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDN0IsTUFBTSxpQkFBSSxDQUFDLGtCQUFrQixHQUFHLFFBQVEsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUE7UUFDL0QsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxpQkFBSSxDQUFDLG1CQUFtQixRQUFRLE9BQU8sUUFBUSxJQUFJLFFBQVEsRUFBRSxDQUFDLENBQUE7UUFDdEUsQ0FBQztRQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixRQUFRLEdBQUcsQ0FBQyxDQUFBO0lBQ3BFLENBQUMsQ0FBQSxDQUFDLENBQUE7SUFFRixrQ0FBa0M7SUFDbEMsTUFBTSxZQUFZLEVBQUUsQ0FBQTtJQUNwQixNQUFNLENBQUE7QUFDUixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxZQUFZLEdBQUc7SUFDakIsR0FBRyxDQUFDLGlCQUFpQixDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDNUMsTUFBTSxpQkFBSSxDQUFDLHNDQUFzQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsc0JBQXNCLENBQUMsQ0FBQTtJQUNsRyxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQywrQ0FBK0MsQ0FBQyxDQUFBO0lBQzFFLE1BQU0sQ0FBQTtBQUNSLENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLEdBQUcsR0FBRztJQUNSLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM3QyxNQUFNLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtBQUN2QixDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsT0FBTyxHQUFHLENBQU8sVUFBd0I7SUFDbEQsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUNuQixLQUFLLEtBQUs7WUFDUixNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQTtRQUNwQixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxNQUFNLEVBQUUsQ0FBQTtRQUN2QixLQUFLLGVBQWU7WUFDbEIsTUFBTSxDQUFDLE1BQU0sWUFBWSxFQUFFLENBQUE7UUFDN0IsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDcEI7WUFDRSxLQUFLLENBQUE7SUFDVCxDQUFDO0FBQ0gsQ0FBQyxDQUFBLENBQUEifQ== | ||||
							
								
								
									
										2
									
								
								dist/mod_publish/index.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/mod_publish/index.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -7,4 +7,4 @@ export declare type TPubService = 'npm' | 'docker'; | ||||
|  * the main exported publish function. | ||||
|  * @param pubServiceArg references targeted service to publish to | ||||
|  */ | ||||
| export declare let publish: (pubServiceArg?: TPubService) => Promise<void | Dockerfile[]>; | ||||
| export declare let publish: (argvArg: any) => Promise<void | Dockerfile[]>; | ||||
|   | ||||
							
								
								
									
										22
									
								
								dist/mod_publish/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								dist/mod_publish/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -15,18 +15,22 @@ const npmciMods = require("../npmci.mods"); | ||||
|  * the main exported publish function. | ||||
|  * @param pubServiceArg references targeted service to publish to | ||||
|  */ | ||||
| exports.publish = (pubServiceArg = 'npm') => __awaiter(this, void 0, void 0, function* () { | ||||
|     switch (pubServiceArg) { | ||||
|         case 'npm': | ||||
|             return yield publishNpm(); | ||||
| exports.publish = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let whatToPublish = argvArg._[1]; | ||||
|     switch (whatToPublish) { | ||||
|         case 'docker': | ||||
|             return yield publishDocker(); | ||||
|             return yield publishDocker(argvArg); | ||||
|         case 'npm': | ||||
|             return yield publishNpm(argvArg); | ||||
|         default: | ||||
|             plugins.beautylog.info('no publish target specified, thus defaulting to npm...'); | ||||
|             return yield publishNpm(argvArg); | ||||
|     } | ||||
| }); | ||||
| /** | ||||
|  * tries to publish current cwd to NPM registry | ||||
|  */ | ||||
| let publishNpm = () => __awaiter(this, void 0, void 0, function* () { | ||||
| let publishNpm = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modPrepare = yield npmciMods.modPrepare.load(); | ||||
|     yield modPrepare.prepare('npm'); | ||||
|     yield npmci_bash_1.bash('npm publish'); | ||||
| @@ -35,13 +39,13 @@ let publishNpm = () => __awaiter(this, void 0, void 0, function* () { | ||||
| /** | ||||
|  * tries to publish current cwd to Docker registry | ||||
|  */ | ||||
| let publishDocker = () => __awaiter(this, void 0, void 0, function* () { | ||||
| let publishDocker = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modDocker = yield npmciMods.modDocker.load(); | ||||
|     return yield modDocker.readDockerfiles() | ||||
|     return yield modDocker.readDockerfiles(argvArg) | ||||
|         .then(modDocker.pullDockerfileImages) | ||||
|         .then(modDocker.pushDockerfiles) | ||||
|         .then(dockerfileArray => { | ||||
|         return dockerfileArray; | ||||
|     }); | ||||
| }); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHVibGlzaC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUdwQywyQ0FBMEM7QUFXMUM7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBTyxnQkFBNkIsS0FBSztJQUM1RCxNQUFNLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3RCLEtBQUssS0FBSztZQUNSLE1BQU0sQ0FBQyxNQUFNLFVBQVUsRUFBRSxDQUFBO1FBQzNCLEtBQUssUUFBUTtZQUNYLE1BQU0sQ0FBQyxNQUFNLGFBQWEsRUFBRSxDQUFBO0lBQ2hDLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxVQUFVLEdBQUc7SUFDZixJQUFJLFVBQVUsR0FBRyxNQUFNLFNBQVMsQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDbEQsTUFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQy9CLE1BQU0saUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN6QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUMvQixDQUFDLENBQUEsQ0FBQTtBQUVEOztHQUVHO0FBQ0gsSUFBSSxhQUFhLEdBQUc7SUFDbEIsSUFBSSxTQUFTLEdBQUcsTUFBTSxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxlQUFlLEVBQUU7U0FDckMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQztTQUNwQyxJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsQ0FBQztTQUMvQixJQUFJLENBQUMsZUFBZTtRQUNuQixNQUFNLENBQUMsZUFBZSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ== | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfcHVibGlzaC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFvQztBQUdwQywyQ0FBMEM7QUFXMUM7OztHQUdHO0FBQ1EsUUFBQSxPQUFPLEdBQUcsQ0FBTyxPQUFZO0lBQ3RDLElBQUksYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDaEMsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUN0QixLQUFLLFFBQVE7WUFDWCxNQUFNLENBQUMsTUFBTSxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDckMsS0FBSyxLQUFLO1lBQ1IsTUFBTSxDQUFDLE1BQU0sVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2xDO1lBQ0UsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsd0RBQXdELENBQUMsQ0FBQTtZQUNoRixNQUFNLENBQUMsTUFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDcEMsQ0FBQztBQUNILENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFVBQVUsR0FBRyxDQUFPLE9BQU87SUFDN0IsSUFBSSxVQUFVLEdBQUcsTUFBTSxTQUFTLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2xELE1BQU0sVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUMvQixNQUFNLGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDekIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDL0IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7R0FFRztBQUNILElBQUksYUFBYSxHQUFHLENBQU8sT0FBTztJQUNoQyxJQUFJLFNBQVMsR0FBRyxNQUFNLFNBQVMsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDaEQsTUFBTSxDQUFDLE1BQU0sU0FBUyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUM7U0FDNUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQztTQUNwQyxJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsQ0FBQztTQUMvQixJQUFJLENBQUMsZUFBZTtRQUNuQixNQUFNLENBQUMsZUFBZSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBLENBQUEifQ== | ||||
							
								
								
									
										2
									
								
								dist/mod_test/index.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/mod_test/index.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -2,4 +2,4 @@ | ||||
|  * the main test function | ||||
|  * @param versionArg | ||||
|  */ | ||||
| export declare let test: (versionArg: any) => Promise<void>; | ||||
| export declare let test: (argvArg: any) => Promise<void>; | ||||
|   | ||||
							
								
								
									
										17
									
								
								dist/mod_test/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								dist/mod_test/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -14,7 +14,7 @@ const npmciMods = require("../npmci.mods"); | ||||
| let npmDependencies = () => __awaiter(this, void 0, void 0, function* () { | ||||
|     plugins.beautylog.info('now installing dependencies:'); | ||||
|     if (yield npmci_bash_1.yarnAvailable.promise) { | ||||
|         yield npmci_bash_1.bash('yarn upgrade'); | ||||
|         yield npmci_bash_1.bash('yarn install'); | ||||
|     } | ||||
|     else { | ||||
|         yield npmci_bash_1.bash('npm install'); | ||||
| @@ -24,9 +24,9 @@ let npmTest = () => __awaiter(this, void 0, void 0, function* () { | ||||
|     plugins.beautylog.info('now starting tests:'); | ||||
|     yield npmci_bash_1.bash('npm test'); | ||||
| }); | ||||
| let testDocker = () => __awaiter(this, void 0, void 0, function* () { | ||||
| let testDocker = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modDocker = yield npmciMods.modDocker.load(); | ||||
|     return yield modDocker.readDockerfiles() | ||||
|     return yield modDocker.readDockerfiles(argvArg) | ||||
|         .then(modDocker.pullDockerfileImages) | ||||
|         .then(modDocker.testDockerfiles); | ||||
| }); | ||||
| @@ -34,15 +34,16 @@ let testDocker = () => __awaiter(this, void 0, void 0, function* () { | ||||
|  * the main test function | ||||
|  * @param versionArg | ||||
|  */ | ||||
| exports.test = (versionArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     if (versionArg === 'docker') { | ||||
|         yield testDocker(); | ||||
| exports.test = (argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let whatToTest = argvArg._[1]; | ||||
|     if (whatToTest === 'docker') { | ||||
|         yield testDocker(argvArg); | ||||
|     } | ||||
|     else { | ||||
|         let modInstall = yield npmciMods.modInstall.load(); | ||||
|         yield modInstall.install(versionArg) | ||||
|         yield modInstall.install(whatToTest) | ||||
|             .then(npmDependencies) | ||||
|             .then(npmTest); | ||||
|     } | ||||
| }); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFtRDtBQUVuRCwyQ0FBMEM7QUFLMUMsSUFBSSxlQUFlLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQTtJQUN0RCxFQUFFLENBQUMsQ0FBQyxNQUFNLDBCQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzNCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM3QyxNQUFNLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7QUFDeEIsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRztJQUNmLElBQUksU0FBUyxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUNoRCxNQUFNLENBQUMsTUFBTSxTQUFTLENBQUMsZUFBZSxFQUFFO1NBQ3JDLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUM7U0FDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUNwQyxDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsSUFBSSxHQUFHLENBQU8sVUFBVTtJQUNqQyxFQUFFLENBQUMsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QixNQUFNLFVBQVUsRUFBRSxDQUFBO0lBQ3BCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLElBQUksVUFBVSxHQUFHLE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNsRCxNQUFNLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2pDLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQSJ9 | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLDhDQUFtRDtBQUVuRCwyQ0FBMEM7QUFLMUMsSUFBSSxlQUFlLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQTtJQUN0RCxFQUFFLENBQUMsQ0FBQyxNQUFNLDBCQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLGlCQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzNCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM3QyxNQUFNLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7QUFDeEIsQ0FBQyxDQUFBLENBQUE7QUFFRCxJQUFJLFVBQVUsR0FBRyxDQUFPLE9BQU87SUFDN0IsSUFBSSxTQUFTLEdBQUcsTUFBTSxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDO1NBQzVDLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUM7U0FDcEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUNwQyxDQUFDLENBQUEsQ0FBQTtBQUVEOzs7R0FHRztBQUNRLFFBQUEsSUFBSSxHQUFHLENBQU8sT0FBTztJQUM5QixJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzdCLEVBQUUsQ0FBQyxDQUFDLFVBQVUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQzVCLE1BQU0sVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLElBQUksVUFBVSxHQUFHLE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNsRCxNQUFNLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2pDLElBQUksQ0FBQyxlQUFlLENBQUM7YUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUEsQ0FBQSJ9 | ||||
							
								
								
									
										16
									
								
								dist/npmci.cli.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								dist/npmci.cli.js
									
									
									
									
										vendored
									
									
								
							| @@ -18,9 +18,9 @@ let smartcli = new plugins.smartcli.Smartcli(); | ||||
| smartcli.addVersion(npmciInfo.version); | ||||
| // build | ||||
| smartcli.addCommand('build') | ||||
|     .then((argv) => __awaiter(this, void 0, void 0, function* () { | ||||
|     .then((argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modBuild = yield npmciMods.modBuild.load(); | ||||
|     yield modBuild.build(argv._[1]); | ||||
|     yield modBuild.build(argvArg); | ||||
|     NpmciEnv.configStore(); | ||||
| })).catch(err => { | ||||
|     console.log(err); | ||||
| @@ -66,9 +66,9 @@ smartcli.addCommand('install') | ||||
| }); | ||||
| // prepare | ||||
| smartcli.addCommand('prepare') | ||||
|     .then((argv) => __awaiter(this, void 0, void 0, function* () { | ||||
|     .then((argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modPrepare = yield npmciMods.modPrepare.load(); | ||||
|     yield modPrepare.prepare(argv._[1]); | ||||
|     yield modPrepare.prepare(argvArg._[1]); | ||||
|     yield NpmciEnv.configStore(); | ||||
| })).catch(err => { | ||||
|     console.log(err); | ||||
| @@ -76,9 +76,9 @@ smartcli.addCommand('prepare') | ||||
| }); | ||||
| // publish | ||||
| smartcli.addCommand('publish') | ||||
|     .then((argv) => __awaiter(this, void 0, void 0, function* () { | ||||
|     .then((argvArg) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modPublish = yield npmciMods.modPublish.load(); | ||||
|     yield modPublish.publish(argv._[1]); | ||||
|     yield modPublish.publish(argvArg); | ||||
|     yield NpmciEnv.configStore(); | ||||
| })).catch(err => { | ||||
|     console.log(err); | ||||
| @@ -88,7 +88,7 @@ smartcli.addCommand('publish') | ||||
| smartcli.addCommand('test') | ||||
|     .then((argv) => __awaiter(this, void 0, void 0, function* () { | ||||
|     let modTest = yield npmciMods.modTest.load(); | ||||
|     yield modTest.test(argv._[1]); | ||||
|     yield modTest.test(argv); | ||||
|     yield NpmciEnv.configStore(); | ||||
| })).catch(err => { | ||||
|     console.log(err); | ||||
| @@ -105,4 +105,4 @@ smartcli.addCommand('trigger') | ||||
|     process.exit(1); | ||||
| }); | ||||
| smartcli.startParse(); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFDOUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTVELHdDQUF1QztBQUV2QywwQ0FBeUM7QUFFekMsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFBO0FBQzlDLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRXRDLFFBQVE7QUFDUixRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztLQUN6QixJQUFJLENBQUMsQ0FBTyxJQUFJO0lBQ2YsSUFBSSxRQUFRLEdBQUcsTUFBTSxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzlDLE1BQU0sUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0IsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7SUFDVixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQU8sSUFBSTtJQUNmLElBQUksUUFBUSxH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 | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLElBQUksU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFDOUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTVELHdDQUF1QztBQUV2QywwQ0FBeUM7QUFFekMsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFBO0FBQzlDLFFBQVEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRXRDLFFBQVE7QUFDUixRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztLQUN6QixJQUFJLENBQUMsQ0FBTSxPQUFPO0lBQ2pCLElBQUksUUFBUSxHQUFHLE1BQU0sU0FBUyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM5QyxNQUFNLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDN0IsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBQ3hCLENBQUMsQ0FBQSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7SUFDVixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyxDQUFDLENBQUE7QUFFSixRQUFRO0FBQ1IsUUFBUSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7S0FDekIsSUFBSSxDQUFDLENBQU8sSUFBSTtJQUNmLElBQUksUUFBUSxHQUFHLE1BQU0sU0FBUyxDQUFDLFFBQVEs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 | ||||
							
								
								
									
										12
									
								
								dist/npmci.env.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								dist/npmci.env.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -1,15 +1,27 @@ | ||||
| import { GitRepo } from 'smartstring'; | ||||
| import { Dockerfile } from './mod_docker/index'; | ||||
| /** | ||||
|  * a info instance about the git respoitory at cwd :) | ||||
|  */ | ||||
| export declare let repo: GitRepo; | ||||
| /** | ||||
|  * the build stage | ||||
|  */ | ||||
| export declare let buildStage: string; | ||||
| export declare let dockerRegistry: string; | ||||
| export declare let setDockerRegistry: (dockerRegistryArg: string) => void; | ||||
| export declare let dockerFilesBuilt: Dockerfile[]; | ||||
| export declare let dockerFiles: Dockerfile[]; | ||||
| /** | ||||
|  * the config | ||||
|  */ | ||||
| export declare let config: { | ||||
|     dockerRegistry: any; | ||||
|     dockerFilesBuilt: Dockerfile[]; | ||||
|     dockerFiles: Dockerfile[]; | ||||
|     project: any; | ||||
| }; | ||||
| /** | ||||
|  * the configuration store | ||||
|  */ | ||||
| export declare let configStore: () => Promise<void>; | ||||
|   | ||||
							
								
								
									
										14
									
								
								dist/npmci.env.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								dist/npmci.env.js
									
									
									
									
										vendored
									
									
								
							| @@ -14,22 +14,34 @@ const smartstring_1 = require("smartstring"); | ||||
| if (process.env.CI_REPOSITORY_URL) { | ||||
|     exports.repo = new smartstring_1.GitRepo(process.env.CI_REPOSITORY_URL); | ||||
| } | ||||
| /** | ||||
|  * the build stage | ||||
|  */ | ||||
| exports.buildStage = process.env.CI_BUILD_STAGE; | ||||
| exports.setDockerRegistry = (dockerRegistryArg) => { | ||||
|     exports.dockerRegistry = dockerRegistryArg; | ||||
| }; | ||||
| exports.dockerFilesBuilt = []; | ||||
| exports.dockerFiles = []; | ||||
| /** | ||||
|  * the config | ||||
|  */ | ||||
| exports.config = { | ||||
|     dockerRegistry: undefined, | ||||
|     dockerFilesBuilt: exports.dockerFilesBuilt, | ||||
|     dockerFiles: exports.dockerFiles, | ||||
|     project: undefined | ||||
| }; | ||||
| /** | ||||
|  * the configuration store | ||||
|  */ | ||||
| exports.configStore = () => __awaiter(this, void 0, void 0, function* () { | ||||
|     exports.config.dockerRegistry = exports.dockerRegistry; | ||||
|     plugins.smartfile.memory.toFsSync(JSON.stringify(exports.config), paths.NpmciPackageConfig); | ||||
| }); | ||||
| /** | ||||
|  * load the config in case a previous run has stored it | ||||
|  */ | ||||
| let configLoad = () => { | ||||
|     // internal config to transfer information in between npmci shell calls | ||||
|     try { | ||||
| @@ -54,4 +66,4 @@ let configLoad = () => { | ||||
|     exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0); | ||||
| }; | ||||
| configLoad(); | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLDZDQUFxQztBQUlyQyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQztJQUNsQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtBQUNuRCxDQUFDO0FBRVUsUUFBQSxVQUFVLEdBQVcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUE7QUFJL0MsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLGlCQUF5QjtJQUN2RCxzQkFBYyxHQUFHLGlCQUFpQixDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUNVLFFBQUEsZ0JBQWdCLEdBQWlCLEVBQUUsQ0FBQTtBQUNuQyxRQUFBLFdBQVcsR0FBaUIsRUFBRSxDQUFBO0FBQzlCLFFBQUEsTUFBTSxHQUFHO0lBQ2xCLGNBQWMsRUFBRSxTQUFTO0lBQ3pCLGdCQUFnQixFQUFFLHdCQUFnQjtJQUNsQyxXQUFXLEVBQUUsbUJBQVc7SUFDeEIsT0FBTyxFQUFFLFNBQVM7Q0FDbkIsQ0FBQTtBQUVVLFFBQUEsV0FBVyxHQUFHO0lBQ3ZCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQTtJQUN0QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQy9CLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDekIsQ0FBQTtBQUNILENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDZix1RUFBdUU7SUFDdkUsSUFBSSxDQUFDO1FBQ0gsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBTSxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUNwRyxDQUFDO0lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNiLG1CQUFXLEVBQUUsQ0FBQTtRQUNiLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUE7SUFDOUMsQ0FBQztJQUVELGlCQUFpQjtJQUNqQixJQUFJLENBQUM7UUFDSCxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLGNBQU0sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUE7WUFDdkYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUMvQyxDQUFDO0lBQ0gsQ0FBQztJQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDYixjQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNuQixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxnRUFBZ0UsQ0FBQyxDQUFBO0lBQ3pGLENBQUM7SUFFRCxjQUFNLENBQUMsY0FBYyxHQUFHLHNCQUFjLEdBQUcsY0FBTSxDQUFDLGNBQWMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekUsY0FBTSxDQUFDLGdCQUFnQixHQUFHLHdCQUFnQixHQUFHLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakYsQ0FBQyxDQUFBO0FBQ0QsVUFBVSxFQUFFLENBQUEifQ== | ||||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtY2kuZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwyQ0FBMEM7QUFDMUMsdUNBQXNDO0FBQ3RDLDZDQUFxQztBQU9yQyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQztJQUNsQyxZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtBQUNuRCxDQUFDO0FBRUQ7O0dBRUc7QUFDUSxRQUFBLFVBQVUsR0FBVyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQTtBQUkvQyxRQUFBLGlCQUFpQixHQUFHLENBQUMsaUJBQXlCO0lBQ3ZELHNCQUFjLEdBQUcsaUJBQWlCLENBQUE7QUFDcEMsQ0FBQyxDQUFBO0FBQ1UsUUFBQSxnQkFBZ0IsR0FBaUIsRUFBRSxDQUFBO0FBQ25DLFFBQUEsV0FBVyxHQUFpQixFQUFFLENBQUE7QUFFekM7O0dBRUc7QUFDUSxRQUFBLE1BQU0sR0FBRztJQUNsQixjQUFjLEVBQUUsU0FBUztJQUN6QixnQkFBZ0IsRUFBRSx3QkFBZ0I7SUFDbEMsV0FBVyxFQUFFLG1CQUFXO0lBQ3hCLE9BQU8sRUFBRSxTQUFTO0NBQ25CLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsV0FBVyxHQUFHO0lBQ3ZCLGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsQ0FBQTtJQUN0QyxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQy9CLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBTSxDQUFDLEVBQ3RCLEtBQUssQ0FBQyxrQkFBa0IsQ0FDekIsQ0FBQTtBQUNILENBQUMsQ0FBQSxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxJQUFJLFVBQVUsR0FBRztJQUNmLHVFQUF1RTtJQUN2RSxJQUFJLENBQUM7UUFDSCxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFNLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBQ3BHLENBQUM7SUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2IsbUJBQVcsRUFBRSxDQUFBO1FBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBRUQsaUJBQWlCO0lBQ2pCLElBQUksQ0FBQztRQUNILEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDcEIsY0FBTSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLENBQUMsQ0FBQTtZQUN2RixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQy9DLENBQUM7SUFDSCxDQUFDO0lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNiLGNBQU0sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFBO1FBQ25CLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDekYsQ0FBQztJQUVELGNBQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxjQUFNLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6RSxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsY0FBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqRixDQUFDLENBQUE7QUFDRCxVQUFVLEVBQUUsQ0FBQSJ9 | ||||
| @@ -1,5 +1,5 @@ | ||||
| # npmci | ||||
| helps with pushing to npm registry from any CI | ||||
| node and docker in gitlab ci on steroids | ||||
|  | ||||
| ## Availabililty | ||||
| [](https://www.npmjs.com/package/npmci) | ||||
|   | ||||
							
								
								
									
										19
									
								
								docs/ssh.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								docs/ssh.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | ||||
| # SSH | ||||
| npmci allows easy usage of ssh: | ||||
|  | ||||
| ## Add the SSH KEY to the environment | ||||
|  | ||||
| To make npmci aware of any SSH KEY add it to the environment in the following format | ||||
| ``` | ||||
| # Key | ||||
| NPMCI_SSHKEY_[A_NAME_FROM_YOU] | ||||
| # Value: | ||||
| [targeted host]|[privatekey as base64]|*** | ||||
| ``` | ||||
|  | ||||
| ## Use npmci cli tool in your ci script | ||||
| ``` | ||||
| npmci prepare ssh | ||||
| npmci command git remote add heroku ssh://git@heroku.com/[you project name].git | ||||
| npmci command git push heroku master | ||||
| ``` | ||||
							
								
								
									
										28
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,7 +1,7 @@ | ||||
| { | ||||
|   "name": "npmci", | ||||
|   "version": "2.3.72", | ||||
|   "description": "", | ||||
|   "version": "2.4.10", | ||||
|   "description": "node and docker in gitlab ci on steroids", | ||||
|   "main": "dist/index.js", | ||||
|   "typings": "dist/index.d.ts", | ||||
|   "bin": { | ||||
| @@ -22,34 +22,34 @@ | ||||
|   }, | ||||
|   "homepage": "https://gitlab.com/gitzone/npmci#README", | ||||
|   "devDependencies": { | ||||
|     "tapbundle": "^1.0.14" | ||||
|     "tapbundle": "^1.1.1" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "@types/lodash": "^4.14.67", | ||||
|     "@types/node": "^8.0.6", | ||||
|     "@types/shelljs": "^0.7.2", | ||||
|     "@types/lodash": "^4.14.74", | ||||
|     "@types/node": "^8.0.25", | ||||
|     "@types/shelljs": "^0.7.4", | ||||
|     "@types/through2": "^2.0.33", | ||||
|     "beautylog": "^6.1.10", | ||||
|     "cflare": "^1.0.5", | ||||
|     "gulp": "^3.9.1", | ||||
|     "gulp-function": "^2.2.9", | ||||
|     "lodash": "^4.17.4", | ||||
|     "npmextra": "^2.0.5", | ||||
|     "npmextra": "^2.0.9", | ||||
|     "projectinfo": "^3.0.2", | ||||
|     "request": "^2.81.0", | ||||
|     "shelljs": "^0.7.8", | ||||
|     "smartcli": "^2.0.7", | ||||
|     "smartdelay": "^1.0.3", | ||||
|     "smartfile": "^4.2.17", | ||||
|     "smartfile": "^4.2.20", | ||||
|     "smartmonitor": "^1.0.3", | ||||
|     "smartparam": "^0.1.1", | ||||
|     "smartq": "^1.1.1", | ||||
|     "smartshell": "^1.0.8", | ||||
|     "smartsocket": "^1.1.7", | ||||
|     "smartparam": "^1.0.1", | ||||
|     "smartq": "^1.1.6", | ||||
|     "smartshell": "^1.0.13", | ||||
|     "smartsocket": "^1.1.10", | ||||
|     "smartssh": "^1.2.2", | ||||
|     "smartstring": "^2.0.24", | ||||
|     "smartsystem": "^1.0.17", | ||||
|     "smartsystem": "^2.0.2", | ||||
|     "through2": "^2.0.3", | ||||
|     "typings-global": "^1.0.19" | ||||
|     "typings-global": "^1.0.20" | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| # npmci | ||||
| helps with pushing to npm registry from any CI | ||||
| node and docker in gitlab ci on steroids | ||||
|  | ||||
| ## Availabililty | ||||
| [](https://www.npmjs.com/package/npmci) | ||||
|   | ||||
							
								
								
									
										52
									
								
								test/test.ts
									
									
									
									
									
								
							
							
						
						
									
										52
									
								
								test/test.ts
									
									
									
									
									
								
							| @@ -10,18 +10,17 @@ process.cwd = () => { | ||||
| } | ||||
|  | ||||
| // require NPMCI files | ||||
| import '../dist/index' | ||||
| import NpmciBuildDocker = require('../dist/mod_docker/index') | ||||
| import NpmciPublish = require('../dist/mod_publish/index') | ||||
| import NpmciTest = require('../dist/mod_test/index') | ||||
| import NpmciSsh = require('../dist/mod_ssh/index') | ||||
| import NpmciEnv = require('../dist/npmci.env') | ||||
| import '../ts/index' | ||||
| import NpmciBuildDocker = require('../ts/mod_docker/index') | ||||
| import NpmciPublish = require('../ts/mod_publish/index') | ||||
| import NpmciTest = require('../ts/mod_test/index') | ||||
| import NpmciSsh = require('../ts/mod_ssh/index') | ||||
| import NpmciEnv = require('../ts/npmci.env') | ||||
|  | ||||
| let dockerfile1: NpmciBuildDocker.Dockerfile | ||||
| let dockerfile2: NpmciBuildDocker.Dockerfile | ||||
| let sortableArray: NpmciBuildDocker.Dockerfile[] | ||||
|  | ||||
|  | ||||
| tap.test('should return valid Dockerfiles', async () => { | ||||
|   dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile', read: true }) | ||||
|   dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: './Dockerfile_sometag1', read: true }) | ||||
| @@ -30,7 +29,7 @@ tap.test('should return valid Dockerfiles', async () => { | ||||
| }) | ||||
|  | ||||
| tap.test('should read a directory of Dockerfiles', async () => { | ||||
|   return NpmciBuildDocker.readDockerfiles() | ||||
|   return NpmciBuildDocker.readDockerfiles({}) | ||||
|     .then(async (readDockerfilesArrayArg: NpmciBuildDocker.Dockerfile[]) => { | ||||
|       sortableArray = readDockerfilesArrayArg | ||||
|       return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1') | ||||
| @@ -45,25 +44,46 @@ tap.test('should sort an array of Dockerfiles', async () => { | ||||
| }) | ||||
|  | ||||
| tap.test('should correctly chain Dockerfile handling', async () => { | ||||
|   return NpmciBuildDocker.build() | ||||
|   return NpmciBuildDocker.build({}) | ||||
| }) | ||||
|  | ||||
| tap.test('should publish all built Dockerfiles', async () => { | ||||
|   return NpmciPublish.publish('docker') | ||||
|   return NpmciPublish.publish({ | ||||
|     _: [ | ||||
|       'test', | ||||
|       'docker' | ||||
|     ] | ||||
|   }) | ||||
| }) | ||||
|  | ||||
| tap.test('should source nvm using bash and install a specific node version, then test it', async () => { | ||||
|   return NpmciTest.test('legacy') | ||||
|     .then(() => { | ||||
|       return NpmciTest.test('lts') | ||||
|   await NpmciTest.test({ | ||||
|     _: [ | ||||
|       'test', | ||||
|       'legacy' | ||||
|     ] | ||||
|   }) | ||||
|     .then(() => { | ||||
|       return NpmciTest.test('stable') | ||||
|   await NpmciTest.test({ | ||||
|     _: [ | ||||
|       'test', | ||||
|       'lts' | ||||
|     ] | ||||
|   }) | ||||
|   await NpmciTest.test({ | ||||
|     _: [ | ||||
|       'test', | ||||
|       'stable' | ||||
|     ] | ||||
|   }) | ||||
| }) | ||||
|  | ||||
| tap.test('should test dockerfiles', async () => { | ||||
|   return NpmciTest.test('docker') | ||||
|   return NpmciTest.test({ | ||||
|     _: [ | ||||
|       'test', | ||||
|       'docker' | ||||
|     ] | ||||
|   }) | ||||
| }) | ||||
|  | ||||
| tap.test('should pick up SSH keys', async () => { | ||||
|   | ||||
| @@ -11,14 +11,15 @@ export type TBuildService = 'docker' | ||||
| /** | ||||
|  * builds for a specific service | ||||
|  */ | ||||
| export let build = async (commandArg): Promise<void> => { | ||||
|   switch (commandArg) { | ||||
| export let build = async (argvArg): Promise<void> => { | ||||
|   let whatToPublish: string = argvArg._[1] | ||||
|   switch (whatToPublish) { | ||||
|     case 'docker': | ||||
|       let modDocker = await npmciMods.modDocker.load() | ||||
|       await modDocker.build() | ||||
|       await modDocker.build(argvArg) | ||||
|       break | ||||
|     default: | ||||
|       plugins.beautylog.log('build target ' + commandArg + ' not recognised!') | ||||
|   }; | ||||
|       plugins.beautylog.log('build target ' + whatToPublish + ' not recognised!') | ||||
|   } | ||||
|   return | ||||
| } | ||||
|   | ||||
| @@ -3,12 +3,15 @@ import * as paths from '../npmci.paths' | ||||
| import * as NpmciEnv from '../npmci.env' | ||||
| import { bash } from '../npmci.bash' | ||||
|  | ||||
| let modArgvArg // will be set through the build command | ||||
|  | ||||
| /** | ||||
|  * builds a cwd of Dockerfiles by triggering a promisechain | ||||
|  */ | ||||
| export let build = async () => { | ||||
| export let build = async (argvArg: any) => { | ||||
|   modArgvArg = argvArg | ||||
|   plugins.beautylog.log('now building Dockerfiles...') | ||||
|   await readDockerfiles() | ||||
|   await readDockerfiles(argvArg) | ||||
|     .then(sortDockerfiles) | ||||
|     .then(mapDockerfiles) | ||||
|     .then(buildDockerfiles) | ||||
| @@ -19,7 +22,8 @@ export let build = async () => { | ||||
|  * creates instance of class Dockerfile for all Dockerfiles in cwd | ||||
|  * @returns Promise<Dockerfile[]> | ||||
|  */ | ||||
| export let readDockerfiles = async (): Promise<Dockerfile[]> => { | ||||
| export let readDockerfiles = async (argvArg): Promise<Dockerfile[]> => { | ||||
|   modArgvArg = argvArg | ||||
|   let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*') | ||||
|  | ||||
|   // create the Dockerfile array | ||||
| @@ -86,7 +90,7 @@ export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise<Dockerfil | ||||
|           dockerfileArg.localBaseDockerfile = dockfile2 | ||||
|         } | ||||
|       }) | ||||
|     }; | ||||
|     } | ||||
|   }) | ||||
|   return sortedArray | ||||
| } | ||||
| @@ -105,8 +109,15 @@ export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => { | ||||
|  * pushes the real Dockerfile images to a Docker registry | ||||
|  */ | ||||
| export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => { | ||||
|   let stageArg = (function () { | ||||
|     if (modArgvArg._ && modArgvArg._.length >= 3) { | ||||
|       return modArgvArg._[2] | ||||
|     } else { | ||||
|       return NpmciEnv.buildStage | ||||
|     } | ||||
|   })() | ||||
|   for (let dockerfileArg of sortedArrayArg) { | ||||
|     await dockerfileArg.push(NpmciEnv.buildStage) | ||||
|     await dockerfileArg.push(stageArg) | ||||
|   } | ||||
|   return sortedArrayArg | ||||
| } | ||||
| @@ -162,10 +173,10 @@ export class Dockerfile { | ||||
|     this.containerName = 'dockerfile-' + this.version | ||||
|     if (options.filePath && options.read) { | ||||
|       this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)) | ||||
|     }; | ||||
|     } | ||||
|     this.baseImage = dockerBaseImage(this.content) | ||||
|     this.localBaseImageDependent = false | ||||
|   }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * builds the Dockerfile | ||||
| @@ -176,7 +187,7 @@ export class Dockerfile { | ||||
|     await bash(buildCommand) | ||||
|     NpmciEnv.dockerFilesBuilt.push(this) | ||||
|     return | ||||
|   }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * pushes the Dockerfile to a registry | ||||
| @@ -199,7 +210,7 @@ export class Dockerfile { | ||||
|         await bash(`docker push ${this.gitlabTestTag}`) | ||||
|         break | ||||
|     } | ||||
|   }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * pulls the Dockerfile from a registry | ||||
| @@ -208,7 +219,7 @@ export class Dockerfile { | ||||
|     let pullTag = this.gitlabTestTag | ||||
|     await bash('docker pull ' + pullTag) | ||||
|     await bash('docker tag ' + pullTag + ' ' + this.buildTag) | ||||
|   }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * tests the Dockerfile; | ||||
| @@ -227,7 +238,7 @@ export class Dockerfile { | ||||
|     } else { | ||||
|       plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!') | ||||
|     } | ||||
|   }; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * gets the id of a Dockerfile | ||||
| @@ -235,7 +246,7 @@ export class Dockerfile { | ||||
|   async getId () { | ||||
|     let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag) | ||||
|     return containerId | ||||
|   }; | ||||
|   } | ||||
| } | ||||
|  | ||||
| /** | ||||
| @@ -255,7 +266,7 @@ export let dockerFileVersion = (dockerfileNameArg: string): string => { | ||||
| } | ||||
|  | ||||
| /** | ||||
|  *  | ||||
|  * returns the docker base image for a Dockerfile | ||||
|  */ | ||||
| export let dockerBaseImage = function (dockerfileContentArg: string) { | ||||
|   let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/ | ||||
| @@ -264,7 +275,7 @@ export let dockerBaseImage = function (dockerfileContentArg: string) { | ||||
| } | ||||
|  | ||||
| /** | ||||
|  *  | ||||
|  * returns the docker tag | ||||
|  */ | ||||
| export let dockerTag = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string { | ||||
|   let tagString: string | ||||
| @@ -273,7 +284,7 @@ export let dockerTag = function (registryArg: string, repoArg: string, versionAr | ||||
|   let version = versionArg | ||||
|   if (suffixArg) { | ||||
|     version = versionArg + '_' + suffixArg | ||||
|   }; | ||||
|   } | ||||
|   tagString = registry + '/' + repo + ':' + version | ||||
|   return tagString | ||||
| } | ||||
|   | ||||
| @@ -31,17 +31,29 @@ let npm = async () => { | ||||
|  * logs in docker | ||||
|  */ | ||||
| let docker = async () => { | ||||
|   env.setDockerRegistry('docker.io') | ||||
|   let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/ | ||||
|   if (!process.env.NPMCI_LOGIN_DOCKER) { | ||||
|     plugins.beautylog.error('You have to specify Login Data to the Docker Registry') | ||||
|   env.setDockerRegistry('docker.io') // TODO: checkup why we set this here | ||||
|  | ||||
|   // handle registries | ||||
|   plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', async (envString) => { | ||||
|     let dockerRegexResultArray = process.env.NPMCI_LOGIN_DOCKER.split('|') | ||||
|     if (dockerRegexResultArray.length !== 3) { | ||||
|       plugins.beautylog.error('malformed docker env var...') | ||||
|       process.exit(1) | ||||
|       return | ||||
|     } | ||||
|   plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry | ||||
|   let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER) | ||||
|     let registry = dockerRegexResultArray[0] | ||||
|     let username = dockerRegexResultArray[1] | ||||
|     let password = dockerRegexResultArray[2] | ||||
|     if (registry === 'docker.io') { | ||||
|       await bash('docker login -u ' + username + ' -p ' + password) | ||||
|     } else { | ||||
|       await bash(`docker login -u ${username} -p ${password} ${registry}`) | ||||
|     } | ||||
|     plugins.beautylog.success(`docker authenticated for ${registry}!`) | ||||
|   }) | ||||
|  | ||||
|   // Always login to GitLab Registry | ||||
|   await dockerGitlab() | ||||
|   return | ||||
| } | ||||
|  | ||||
| @@ -50,7 +62,8 @@ let docker = async () => { | ||||
|  */ | ||||
| let dockerGitlab = async () => { | ||||
|   env.setDockerRegistry('registry.gitlab.com') | ||||
|   plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') | ||||
|   await bash(`docker login -u gitlab-ci-token -p ${process.env.CI_BUILD_TOKEN} registry.gitlab.com`) | ||||
|   plugins.beautylog.success(`docker authenticated for registry.gitlab.com!`) | ||||
|   return | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -17,19 +17,23 @@ export type TPubService = 'npm' | 'docker' | ||||
|  * the main exported publish function. | ||||
|  * @param pubServiceArg references targeted service to publish to  | ||||
|  */ | ||||
| export let publish = async (pubServiceArg: TPubService = 'npm') => { | ||||
|   switch (pubServiceArg) { | ||||
|     case 'npm': | ||||
|       return await publishNpm() | ||||
| export let publish = async (argvArg: any) => { | ||||
|   let whatToPublish = argvArg._[1] | ||||
|   switch (whatToPublish) { | ||||
|     case 'docker': | ||||
|       return await publishDocker() | ||||
|       return await publishDocker(argvArg) | ||||
|     case 'npm': | ||||
|       return await publishNpm(argvArg) | ||||
|     default: | ||||
|       plugins.beautylog.info('no publish target specified, thus defaulting to npm...') | ||||
|       return await publishNpm(argvArg) | ||||
|   } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * tries to publish current cwd to NPM registry | ||||
|  */ | ||||
| let publishNpm = async () => { | ||||
| let publishNpm = async (argvArg) => { | ||||
|   let modPrepare = await npmciMods.modPrepare.load() | ||||
|   await modPrepare.prepare('npm') | ||||
|   await bash('npm publish') | ||||
| @@ -39,9 +43,9 @@ let publishNpm = async () => { | ||||
| /** | ||||
|  * tries to publish current cwd to Docker registry | ||||
|  */ | ||||
| let publishDocker = async () => { | ||||
| let publishDocker = async (argvArg) => { | ||||
|   let modDocker = await npmciMods.modDocker.load() | ||||
|   return await modDocker.readDockerfiles() | ||||
|   return await modDocker.readDockerfiles(argvArg) | ||||
|     .then(modDocker.pullDockerfileImages) | ||||
|     .then(modDocker.pushDockerfiles) | ||||
|     .then(dockerfileArray => { | ||||
|   | ||||
| @@ -9,7 +9,7 @@ import { Dockerfile } from '../mod_docker/index' | ||||
| let npmDependencies = async (): Promise<void> => { | ||||
|   plugins.beautylog.info('now installing dependencies:') | ||||
|   if (await yarnAvailable.promise) { | ||||
|     await bash('yarn upgrade') | ||||
|     await bash('yarn install') | ||||
|   } else { | ||||
|     await bash('npm install') | ||||
|   } | ||||
| @@ -20,9 +20,9 @@ let npmTest = async (): Promise<void> => { | ||||
|   await bash('npm test') | ||||
| } | ||||
|  | ||||
| let testDocker = async (): Promise<Dockerfile[]> => { | ||||
| let testDocker = async (argvArg): Promise<Dockerfile[]> => { | ||||
|   let modDocker = await npmciMods.modDocker.load() | ||||
|   return await modDocker.readDockerfiles() | ||||
|   return await modDocker.readDockerfiles(argvArg) | ||||
|     .then(modDocker.pullDockerfileImages) | ||||
|     .then(modDocker.testDockerfiles) | ||||
| } | ||||
| @@ -31,12 +31,13 @@ let testDocker = async (): Promise<Dockerfile[]> => { | ||||
|  * the main test function | ||||
|  * @param versionArg | ||||
|  */ | ||||
| export let test = async (versionArg): Promise<void> => { | ||||
|   if (versionArg === 'docker') { | ||||
|     await testDocker() | ||||
| export let test = async (argvArg): Promise<void> => { | ||||
|   let whatToTest = argvArg._[1] | ||||
|   if (whatToTest === 'docker') { | ||||
|     await testDocker(argvArg) | ||||
|   } else { | ||||
|     let modInstall = await npmciMods.modInstall.load() | ||||
|     await modInstall.install(versionArg) | ||||
|     await modInstall.install(whatToTest) | ||||
|       .then(npmDependencies) | ||||
|       .then(npmTest) | ||||
|   } | ||||
|   | ||||
| @@ -12,9 +12,9 @@ smartcli.addVersion(npmciInfo.version) | ||||
|  | ||||
| // build | ||||
| smartcli.addCommand('build') | ||||
|   .then(async (argv) => { | ||||
|   .then(async argvArg => { | ||||
|     let modBuild = await npmciMods.modBuild.load() | ||||
|     await modBuild.build(argv._[1]) | ||||
|     await modBuild.build(argvArg) | ||||
|     NpmciEnv.configStore() | ||||
|   }).catch(err => { | ||||
|     console.log(err) | ||||
| @@ -65,9 +65,9 @@ smartcli.addCommand('install') | ||||
|  | ||||
| // prepare | ||||
| smartcli.addCommand('prepare') | ||||
|   .then(async (argv) => { | ||||
|   .then(async argvArg => { | ||||
|     let modPrepare = await npmciMods.modPrepare.load() | ||||
|     await modPrepare.prepare(argv._[1]) | ||||
|     await modPrepare.prepare(argvArg._[1]) | ||||
|     await NpmciEnv.configStore() | ||||
|   }).catch(err => { | ||||
|     console.log(err) | ||||
| @@ -76,9 +76,9 @@ smartcli.addCommand('prepare') | ||||
|  | ||||
| // publish | ||||
| smartcli.addCommand('publish') | ||||
|   .then(async (argv) => { | ||||
|   .then(async argvArg => { | ||||
|     let modPublish = await npmciMods.modPublish.load() | ||||
|     await modPublish.publish(argv._[1]) | ||||
|     await modPublish.publish(argvArg) | ||||
|     await NpmciEnv.configStore() | ||||
|  | ||||
|   }).catch(err => { | ||||
| @@ -90,7 +90,7 @@ smartcli.addCommand('publish') | ||||
| smartcli.addCommand('test') | ||||
|   .then(async (argv) => { | ||||
|     let modTest = await npmciMods.modTest.load() | ||||
|     await modTest.test(argv._[1]) | ||||
|     await modTest.test(argv) | ||||
|     await NpmciEnv.configStore() | ||||
|   }).catch(err => { | ||||
|     console.log(err) | ||||
|   | ||||
| @@ -3,11 +3,17 @@ import * as paths from './npmci.paths' | ||||
| import { GitRepo } from 'smartstring' | ||||
| import { Dockerfile } from './mod_docker/index' | ||||
|  | ||||
| /** | ||||
|  * a info instance about the git respoitory at cwd :) | ||||
|  */ | ||||
| export let repo: GitRepo | ||||
| if (process.env.CI_REPOSITORY_URL) { | ||||
|   repo = new GitRepo(process.env.CI_REPOSITORY_URL) | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * the build stage | ||||
|  */ | ||||
| export let buildStage: string = process.env.CI_BUILD_STAGE | ||||
|  | ||||
| // handling config between commands | ||||
| @@ -17,6 +23,10 @@ export let setDockerRegistry = (dockerRegistryArg: string) => { | ||||
| } | ||||
| export let dockerFilesBuilt: Dockerfile[] = [] | ||||
| export let dockerFiles: Dockerfile[] = [] | ||||
|  | ||||
| /** | ||||
|  * the config | ||||
|  */ | ||||
| export let config = { | ||||
|   dockerRegistry: undefined, // this will be set later on store | ||||
|   dockerFilesBuilt: dockerFilesBuilt, | ||||
| @@ -24,6 +34,9 @@ export let config = { | ||||
|   project: undefined | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * the configuration store | ||||
|  */ | ||||
| export let configStore = async () => { | ||||
|   config.dockerRegistry = dockerRegistry | ||||
|   plugins.smartfile.memory.toFsSync( | ||||
| @@ -32,6 +45,9 @@ export let configStore = async () => { | ||||
|   ) | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * load the config in case a previous run has stored it | ||||
|  */ | ||||
| let configLoad = () => { | ||||
|   // internal config to transfer information in between npmci shell calls | ||||
|   try { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user