noe handling docker as well

This commit is contained in:
Philipp Kunz
2016-06-02 13:08:15 +02:00
parent b37a2f78c4
commit d6e597111e
8 changed files with 37 additions and 12 deletions

View File

@ -9,6 +9,7 @@ plugins.beautylog.info("npmci version: " + packJson.version);
import {install} from "./npmci.install";
import {test} from "./npmci.test";
import {publish} from "./npmci.publish";
import {prepare} from "./npmci.prepare";
import {trigger} from "./npmci.trigger";
@ -37,7 +38,7 @@ switch (command){
test(commandOption);
break;
case "prepare":
prepare(commandOption);
break;
case "publish":
publish(commandOption)

View File

@ -2,14 +2,21 @@ import "typings-global";
import * as plugins from "./npmci.plugins";
let docker = function(){
let done = plugins.q.defer();
let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
let dockerRegexResultArray = dockerRegex.exec("process.env.NPMCI_LOGIN_DOCKER");
let username = dockerRegexResultArray[1];
let password = dockerRegexResultArray[2];
plugins.shelljs.exec("docker login -u " + username + " -p " + password);
done.resolve();
return done.promise;
}
let npm = function(){
let done = plugins.q.defer();
let npmrcPrefix:string = "//registry.npmjs.org/:_authToken=";
let npmToken:string = process.env.NPMCITOKEN;
let npmToken:string = process.env.NPMCI_TOKEN_NPM;
let npmrcFileString = npmrcPrefix + npmToken;
if(npmToken){

View File

@ -37,6 +37,7 @@ let publishDocker = function(){
prepare("docker")
.then(function(){
bash("docker push");
done.resolve();
});
return done.promise;
};

View File

@ -3,13 +3,16 @@ import * as plugins from "./npmci.plugins";
import {prepare} from "./npmci.prepare";
import {bash} from "./npmci.bash";
//Variables
let triggerEnvPrefix = "NPMCI_TRIGGER";
export let trigger = function(){
let done = plugins.q.defer();
plugins.beautylog.info("now running triggers");
let triggerRegex = /^([a-zA-Z0-9\.]*)\/([a-zA-Z0-9\.]*)\/([a-zA-Z0-9\.]*)\/([a-zA-Z0-9\.]*)/;
let triggerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/;
for(let i = 0; i < 100; i++){
let iteratorString = i.toString();
if(process.env["TRIGGER" + iteratorString]){
if(process.env[triggerEnvPrefix + iteratorString]){
let triggerRegexResultArray = triggerRegex.exec(process.env["TRIGGER" + iteratorString]);
let regexDomain = triggerRegexResultArray[1];
let regexProjectId = triggerRegexResultArray[2];