full docker workflow now implemented

This commit is contained in:
2016-06-07 04:31:25 +02:00
parent fe0b99309b
commit 9f4a3783a1
8 changed files with 62 additions and 28 deletions

View File

@ -94,8 +94,10 @@ export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){
export let pullDockerfileImages = (sortableArrayArg:Dockerfile[]) => {
let done = plugins.q.defer();
sortableArrayArg;
done.resolve();
sortableArrayArg.forEach((dockerfileArg) => {
dockerfileArg.pull();
});
done.resolve(sortableArrayArg);
return done.promise;
}

View File

@ -28,8 +28,8 @@ let publishNpm = function(){
let publishDocker = function(){
let done = plugins.q.defer();
NpmciBuildDocker.readDockerfiles()
done.resolve();
.then(NpmciBuildDocker.pullDockerfileImages)
.then(NpmciBuildDocker.releaseDockerfiles)
.then(done.resolve);
return done.promise;
};

View File

@ -3,6 +3,7 @@ import * as plugins from "./npmci.plugins";
import {bash} from "./npmci.bash";
import {install} from "./npmci.install";
import * as env from "./npmci.env";
import * as NpmciBuildDocker from "./npmci.build.docker";
export let test = (versionArg) => {
let done = plugins.q.defer();
@ -14,10 +15,8 @@ export let test = (versionArg) => {
} else {
install(versionArg)
.then(npmDependencies)
.then(npmTest)
.then(()=>{
plugins.beautylog.info("now starting tests:");
bash("npm test");
plugins.beautylog.success("test finished");
done.resolve();
});
}
@ -32,10 +31,20 @@ let npmDependencies = function(){
return done.promise;
}
let testDocker = function(){
let npmTest = () => {
let done = plugins.q.defer();
plugins.beautylog.info("now starting tests:");
bash("npm test");
done.resolve();
return done.promise;
}
let testDocker = function(){
let done = plugins.q.defer();
NpmciBuildDocker.readDockerfiles()
.then(NpmciBuildDocker.pullDockerfileImages)
.then(NpmciBuildDocker.testDockerfiles)
.then(done.resolve)
return done.promise;
}