updated setter for environment module to comply with JS standards

This commit is contained in:
2016-07-18 18:39:04 +02:00
parent 6f4138e536
commit 0213afa46e
7 changed files with 15 additions and 40 deletions

View File

@ -11,6 +11,9 @@ export let buildStage:string = process.env.CI_BUILD_STAGE;
// handling config between commands
export let dockerRegistry:string; // will be set by npmci.prepare
export let setDockerRegistry = (dockerRegistryArg:string) => {
dockerRegistry = dockerRegistryArg;
}
export let dockerFilesBuilt:Dockerfile[] = [];
export let dockerFiles:Dockerfile[] = [];
export let config = {

View File

@ -24,7 +24,7 @@ let npm = function(){
let docker = function(){
let done = plugins.q.defer();
env.dockerRegistry = "docker.io";
env.setDockerRegistry("docker.io");
let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
if(!process.env.NPMCI_LOGIN_DOCKER){
plugins.beautylog.error("You have to specify Login Data to the Docker Registry");
@ -41,7 +41,7 @@ let docker = function(){
let dockerGitlab = function(){
let done = plugins.q.defer();
env.dockerRegistry = "registry.gitlab.com";
env.setDockerRegistry("registry.gitlab.com");
plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com");
done.resolve();
return done.promise;