Compare commits
	
		
			6 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0acb6ad351 | |||
| c33e0c622b | |||
| 5085e86c9b | |||
| 3ea8265a75 | |||
| d7e4efc2c0 | |||
| 7ca0171658 | 
							
								
								
									
										8
									
								
								dist/npmci.build.docker.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/npmci.build.docker.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "npmci", |   "name": "npmci", | ||||||
|   "version": "2.1.37", |   "version": "2.1.39", | ||||||
|   "description": "", |   "description": "", | ||||||
|   "main": "dist/index.js", |   "main": "dist/index.js", | ||||||
|   "bin": { |   "bin": { | ||||||
|   | |||||||
| @@ -147,6 +147,7 @@ export class Dockerfile { | |||||||
|         this.localBaseImageDependent = false; |         this.localBaseImageDependent = false; | ||||||
|     }; |     }; | ||||||
|     build(){ |     build(){ | ||||||
|  |         plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); | ||||||
|         let done = plugins.q.defer(); |         let done = plugins.q.defer(); | ||||||
|         this.patchContents(); |         this.patchContents(); | ||||||
|         bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); |         bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); | ||||||
| @@ -175,7 +176,7 @@ export class Dockerfile { | |||||||
|         if(testExists){ |         if(testExists){ | ||||||
|             bashBare("docker run -v " +  |             bashBare("docker run -v " +  | ||||||
|                 plugins.path.join(paths.NpmciProjectDir,"./test") + ":/test/ " + |                 plugins.path.join(paths.NpmciProjectDir,"./test") + ":/test/ " + | ||||||
|                 "--name " + this.containerName + " /test/" + "test_" + this.version  + ".sh"); |                 "--name " + this.containerName + " " + this.buildTag + " /test/" + "test_" + this.version  + ".sh"); | ||||||
|         } else { |         } else { | ||||||
|             plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!"); |             plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!"); | ||||||
|         } |         } | ||||||
| @@ -185,12 +186,13 @@ export class Dockerfile { | |||||||
|         bashBare("docker push " + this.releaseTag); |         bashBare("docker push " + this.releaseTag); | ||||||
|     } |     } | ||||||
|     getId(){ |     getId(){ | ||||||
|         let containerId = bashBare("docker inspect --format=\"{{.Id}}\" " + this.buildTag); |         let containerId = bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag); | ||||||
|         return containerId; |         return containerId; | ||||||
|     }; |     }; | ||||||
|     patchContents(){ |     patchContents(){ | ||||||
|         let done = plugins.q.defer(); |         let done = plugins.q.defer(); | ||||||
|         if(this.localBaseImageDependent == true){ |         if(this.localBaseImageDependent == true){ | ||||||
|  |             plugins.beautylog.info("patching Dockerfile due to local build dependency!"); | ||||||
|             this.patchedContent = this.content.replace(/FROM\s[a-zA-Z0-9\/\-\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag); |             this.patchedContent = this.content.replace(/FROM\s[a-zA-Z0-9\/\-\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag); | ||||||
|             plugins.smartfile.memory.toFsSync( |             plugins.smartfile.memory.toFsSync( | ||||||
|                 this.patchedContent, |                 this.patchedContent, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user