Compare commits
	
		
			2 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 49f2498ecd | |||
| 1060060366 | 
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@shipzone/npmci", | ||||
|   "version": "4.1.15", | ||||
|   "version": "4.1.16", | ||||
|   "private": false, | ||||
|   "description": "node and docker in gitlab ci on steroids", | ||||
|   "main": "dist_ts/index.js", | ||||
|   | ||||
| @@ -3,6 +3,6 @@ | ||||
|  */ | ||||
| export const commitinfo = { | ||||
|   name: '@shipzone/npmci', | ||||
|   version: '4.1.15', | ||||
|   version: '4.1.16', | ||||
|   description: 'node and docker in gitlab ci on steroids' | ||||
| } | ||||
|   | ||||
| @@ -120,7 +120,7 @@ export class Dockerfile { | ||||
|    * returns a version for a docker file | ||||
|    * @execution SYNC | ||||
|    */ | ||||
|   public static dockerFileVersion(dockerfileNameArg: string): string { | ||||
|   public static dockerFileVersion(dockerfileInstanceArg: Dockerfile, dockerfileNameArg: string): string { | ||||
|     let versionString: string; | ||||
|     const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; | ||||
|     const regexResultArray = versionRegex.exec(dockerfileNameArg); | ||||
| @@ -129,6 +129,10 @@ export class Dockerfile { | ||||
|     } else { | ||||
|       versionString = 'latest'; | ||||
|     } | ||||
|     versionString.replace( | ||||
|       '##version##', | ||||
|       dockerfileInstanceArg.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version | ||||
|     ); | ||||
|     return versionString; | ||||
|   } | ||||
|  | ||||
| @@ -233,7 +237,7 @@ export class Dockerfile { | ||||
|       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user + | ||||
|       '/' + | ||||
|       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.buildTag = this.cleanTag; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user