added dockerSock option
This commit is contained in:
@ -4,6 +4,7 @@ import * as paths from "./npmdocker.paths";
|
||||
export interface IConfig {
|
||||
baseImage:string;
|
||||
command:string;
|
||||
dockerSock:boolean;
|
||||
exitCode?:number
|
||||
}
|
||||
|
||||
@ -11,7 +12,8 @@ let config:IConfig = plugins.npmextra.dataFor({
|
||||
toolName:"npmdocker",
|
||||
defaultSettings: {
|
||||
baseImage:"hosttoday/ht-docker-node:npmts",
|
||||
command:"npm test"
|
||||
command:"npm test",
|
||||
dockerSock: false
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -70,7 +70,11 @@ let runDockerImage = () => {
|
||||
let done = plugins.q.defer();
|
||||
npmdockerOra.text("starting Container...");
|
||||
npmdockerOra.end();
|
||||
config.exitCode = plugins.shelljs.exec(`docker run -v ${paths.cwd}:/workspace --name ${dockerData.containerName} ${dockerData.imageTag}`).code;
|
||||
let dockerSockString:string = "";
|
||||
if(config.dockerSock){
|
||||
dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
|
||||
};
|
||||
config.exitCode = plugins.shelljs.exec(`docker run -v ${paths.cwd}:/workspace ${dockerSockString} --name ${dockerData.containerName} ${dockerData.imageTag}`).code;
|
||||
done.resolve();
|
||||
return done.promise;
|
||||
};
|
||||
|
Reference in New Issue
Block a user