Compare commits

...

2 Commits

Author SHA1 Message Date
cb2400652f 2.1.43 2016-06-07 12:12:25 +02:00
455247eb18 improved docker image testing 2016-06-07 12:12:19 +02:00
4 changed files with 19 additions and 20 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "2.1.42", "version": "2.1.43",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {

View File

@@ -1,3 +1,2 @@
#!/bin/sh
npm -v npm -v
node -v node -v

View File

@@ -170,15 +170,15 @@ export class Dockerfile {
bashBare("docker pull " + this.buildTag); bashBare("docker pull " + this.buildTag);
}; };
test(){ test(){
let testFile = plugins.path.join(paths.NpmciTestDir,"test_" + this.version + ".sh"); let testFile:string = plugins.path.join(paths.NpmciTestDir,"test_" + this.version + ".sh");
let testExists = plugins.smartfile.checks.fileExistsSync(testFile); let testFileExists:boolean = plugins.smartfile.checks.fileExistsSync(testFile);
if(testExists){ if(testFileExists){
console.log("docker run -v " + bashBare("docker run --name npmci_test_container " + this.buildTag + " mkdir /npmci_test");
paths.NpmciTestDir + ":/test " + bashBare("docker cp " + testFile + " npmci_test_container:/npmci_test/test.sh");
"--name " + this.containerName + " " + this.buildTag + " /test/" + "test_" + this.version + ".sh"); bashBare("docker commit npmci_test_container npmci_test_image");
bashBare("docker run -v " + bashBare("docker run npmci_test_image sh /npmci_test/test.sh");
paths.NpmciTestDir + ":/test " + bashBare("docker rm npmci_test_container");
"--name " + this.containerName + " " + this.buildTag + " /test/" + "test_" + this.version + ".sh"); bashBare("docker rmi --force npmci_test_image");
} 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!");
} }